Skip to content

Commit

Permalink
Unified line breaks in credits.txt
Browse files Browse the repository at this point in the history
Updated manual install batch/shell script.
Removed obsolete sfall setting and disabled debug mode by default.
  • Loading branch information
NovaRain committed Aug 28, 2023
1 parent 6ad2ae1 commit 465c1e6
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 36 deletions.
1 change: 0 additions & 1 deletion data/text/english/credits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -484,4 +484,3 @@ Paul Naftalis


@Hah! Enjoy...

2 changes: 1 addition & 1 deletion extra/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export release_dir="$(realpath release)"
export mods_dir="$release_dir/mods"
export mpack_version=${mpack_version:-4.4}
export mpack_7z="mpack.7z"
export sfall_version=${sfall_version:-4.4}
export sfall_version=${sfall_version:-4.4.0.1}
export WINEARCH=win32
export WINEDEBUG=-all
export mod_name=upu
Expand Down
5 changes: 1 addition & 4 deletions extra/package/ddraw.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[Main]
HiResMode=0

[Sound]
FadeBackgroundMusic=0

[Misc]
AIDrugUsePerfFix=1
ExtraSaveSlots=1
Expand All @@ -17,7 +14,7 @@ IniConfigFolder=mods

[Debugging]
Enable=0
DebugMode=2
DebugMode=0
Init=1
Hook=1
Script=1
Expand Down
54 changes: 26 additions & 28 deletions release/upu-install.bat
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
set "bdir=backup\upu"
set "scripts_dir=data\scripts"

if not exist %bdir% mkdir %bdir%

if exist patch000.dat (
move patch000.dat %bdir%\
)
if exist f2_res.dat (
move f2_res.dat %bdir%\
)

:: I don't know how to iterate over files in batch properly, so just moving back and forth
move /y data %bdir%\
mkdir data\sound
move /y %bdir%\data\savegame data\
move /y %bdir%\data\*.txt data\
move /y %bdir%\data\*.gcd data\
move /y %bdir%\data\sound\music data\sound\

:: sfall scripts
mkdir %scripts_dir%
move /y gl_ammomod.int %scripts_dir%\
move /y gl_highlighting.int %scripts_dir%\
move /y gl_partycontrol.int %scripts_dir%\

del /s upu-install.sh upu-install.bat upu-install.command
echo UPU installed. Backup is in %bdir%
set "bdir=backup\upu"
set "scripts_dir=data\scripts"

if not exist %bdir% mkdir %bdir%

if exist patch000.dat (
move patch000.dat %bdir%\
)
if exist f2_res.dat (
move f2_res.dat %bdir%\
)

:: I don't know how to iterate over files in batch properly, so just moving back and forth
move /y data %bdir%\
mkdir data\sound
move /y %bdir%\data\savegame data\
move /y %bdir%\data\*.txt data\
move /y %bdir%\data\*.gcd data\
move /y %bdir%\data\sound\music data\sound\

:: sfall scripts
mkdir %scripts_dir%
move /y gl_ammomod.int %scripts_dir%\

del /s upu-install.sh upu-install.bat upu-install.command
echo UPU installed. Backup is in %bdir%
2 changes: 0 additions & 2 deletions release/upu-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ done
mkdir -p data/scripts
scripts="
gl_ammomod.int
gl_highlighting.int
gl_partycontrol.int
"
for f in $scripts; do
mv "$f" data/scripts/
Expand Down

0 comments on commit 465c1e6

Please sign in to comment.