commit 5c7b6231d2a5316a356261df69db079b56ddfba0
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Fri Jan 21 18:52:15 2022 -0500
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Fri Jan 21 18:52:15 2022 -0500
Change setup tool to use -merge instead of -file.
This is the more "ergonomic" option to use that correctly handles WADs
that use sprites, and is consistent with what we do in the macOS launcher
and when doing drag-and-drop.
---
src/setup/multiplayer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
index 998e24fd..dfb2d266 100644
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -175,7 +175,7 @@ static void AddWADs(execute_context_t *exec)
{
if (!have_wads)
{
- AddCmdLineParameter(exec, "-file");
+ AddCmdLineParameter(exec, "-merge");
have_wads = 1;
}