From 014e14af6f6455d79b0a4fd9da3ccf8d4a5a163a Mon Sep 17 00:00:00 2001 From: Goober5000 Date: Fri, 9 Oct 2026 00:38:20 -0400 Subject: [PATCH] Remove 3D shockwave glow map warning The warning fired for any 3D shockwave model without a glow map, but it turns out that situation is fine. Drop the warning along with the cmdline include it required. Co-Authored-By: Claude Sonnet 5.5 --- code/weapon/shockwave.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/weapon/shockwave.cpp b/code/weapon/shockwave.cpp index ec75394bfc..e2dcfb7a88 100644 --- a/code/weapon/shockwave.cpp +++ b/code/weapon/shockwave.cpp @@ -9,7 +9,6 @@ #include "weapon/shockwave.h" #include "asteroid/asteroid.h" -#include "cmdline/cmdline.h" #include "gamesnd/gamesnd.h" #include "globalincs/linklist.h" #include "io/timer.h" @@ -578,17 +577,6 @@ int shockwave_load(const char *s_name, bool shock_3D) Shockwave_info.pop_back(); return -1; } - - // glow maps are only loaded when enabled, so only check then - if (Cmdline_glow || Fred_running) { - auto pm = model_get(si->model_id); - bool has_glow = std::any_of(pm->maps, pm->maps + pm->n_textures, [](const texture_map &tmap) { - return tmap.textures[TM_GLOW_TYPE].GetTexture() >= 0; - }); - - if (!has_glow) - Warning(LOCATION, "3D shockwave model '%s' has no glow map. For a 3D shockwave, the glow texture typically carries the animation.", si->filename); - } } else { si->bitmap_id = bm_load_animation( si->filename, &si->num_frames, &si->fps, nullptr, nullptr, true );