shithub: choc

Download patch

ref: 5c7b6231d2a5316a356261df69db079b56ddfba0
parent: c8d319222d67bfd848b8770fa050883ef590cb10
author: Simon Howard <fraggle@soulsphere.org>
date: Fri Jan 21 13:52:15 EST 2022

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.

--- a/src/setup/multiplayer.c

+++ b/src/setup/multiplayer.c

@@ -175,7 +175,7 @@

         {

             if (!have_wads)

             {

-                AddCmdLineParameter(exec, "-file");

+                AddCmdLineParameter(exec, "-merge");

                 have_wads = 1;

             }