From 2d2a5c3ea4664240bed4d9fe42e731c553b553e3 Mon Sep 17 00:00:00 2001 From: yrriban Date: Fri, 28 Nov 2025 15:16:43 -0500 Subject: [PATCH] Use the common configured load order where applicable. --- dcc/configure.py | 7 +------ dcc/extract.py | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dcc/configure.py b/dcc/configure.py index bb7c39a..31ed4b5 100644 --- a/dcc/configure.py +++ b/dcc/configure.py @@ -15,14 +15,9 @@ class Configure(dcc.doom_base.Wad): if new_config.exists(): raise Exception(f"Config {new_config} already exists.") - wads = sorted( - self.pwads.joinpath(self.wad).glob('*.wad', case_sensitive=False), - reverse=True - ) - complevel = parsed_args.complevel if complevel is None: - for w in wads: + for w in self.load_order(): try: wad = omg.WadIO(w) complevel = wad.read("COMPLVL").decode("ascii").strip() diff --git a/dcc/extract.py b/dcc/extract.py index 447ffa9..292bd39 100644 --- a/dcc/extract.py +++ b/dcc/extract.py @@ -12,12 +12,7 @@ class Extract(dcc.doom_base.Wad): return parser def take_action(self, parsed_args): - wads = sorted( - self.pwads.joinpath(self.wad).glob('*.wad', case_sensitive=False), - reverse=True - ) - - for w in wads: + for w in self.load_order() try: # TODO: handle anything other than graphics. wad = omg.WadIO(w)