mirror of
https://github.com/scp-fs2open/fs2open.github.com.git
synced 2026-11-07 08:15:59 -10:00
Merge pull request #7836 from Goober5000/cleanup/remove_glow_warning
Remove 3D shockwave glow map warning
This commit is contained in:
1 file changed
-12
@@ -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 );
|
||||
|
||||
|
||||
Reference in new issue
Block a user