From bd198286a900942335bfa3748889d94c044f8f74 Mon Sep 17 00:00:00 2001 From: TimePath Date: Thu, 10 Mar 2016 09:50:41 +1100 Subject: [PATCH] Suppress mutator blocked weapon warnings --- qcsrc/common/mapinfo.qc | 5 ----- qcsrc/common/mapinfo.qh | 5 +++++ qcsrc/server/weapons/spawning.qc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 56dcce489..d853eeac3 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -10,11 +10,6 @@ #include "mapinfo.qh" #endif -bool autocvar_developer_mapper; - -#define LOG_MAPWARN(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARNING(__VA_ARGS__); } MACRO_END -#define LOG_MAPWARNF(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARNINGF(__VA_ARGS__); } MACRO_END - // generic string stuff int _MapInfo_Cache_Active; diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index 702798bbf..ab7233ef2 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -1,6 +1,11 @@ #ifndef MAPINFO_H #define MAPINFO_H +bool autocvar_developer_mapper; + +#define LOG_MAPWARN(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARNING(__VA_ARGS__); } MACRO_END +#define LOG_MAPWARNF(...) MACRO_BEGIN { if (autocvar_developer_mapper) LOG_WARNINGF(__VA_ARGS__); } MACRO_END + #include "util.qh" CLASS(Gametype, Object) diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 578c941f7..579e6fdff 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -29,7 +29,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e) { if (e.spawnflags & WEP_FLAG_MUTATORBLOCKED) { - objerror("Attempted to spawn a mutator-blocked weapon rejected"); + LOG_MAPWARNF("Attempted to spawn a mutator-blocked weapon rejected: prvm_edict server %i", this); startitem_failed = true; return; } -- 2.39.2