From 9e3d75afce10b43a339c463cbad0a75992e94a86 Mon Sep 17 00:00:00 2001
From: sauerbraten <willing.alexander@googlemail.com>
Date: Thu, 25 Feb 2021 15:21:26 +0100
Subject: [PATCH] fix console message flags of renames/leaves

---
 patches/zenmode.patch  | 6 +++---
 src/fpsgame/client.cpp | 4 ++--
 src/fpsgame/fps.cpp    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/zenmode.patch b/patches/zenmode.patch
index ade5701..2c09b03 100644
--- a/patches/zenmode.patch
+++ b/patches/zenmode.patch
@@ -101,7 +101,7 @@ Index: src/fpsgame/client.cpp
                  {
                      if(strcmp(d->name, text) && !isignored(d->clientnum))
 -                        conoutf("%s is now known as %s", colorname(d), colorname(d, text));
-+                        conoutf(d->state==CS_SPECTATOR ? CON_INFO|CON_NONZEN : 0, "%s is now known as %s", colorname(d), colorname(d, text));
++                        conoutf(CON_INFO + (d->state==CS_SPECTATOR ? CON_NONZEN : 0), "%s is now known as %s", colorname(d), colorname(d, text));
                  }
                  else                    // new client
                  {
@@ -115,7 +115,7 @@ Index: src/fpsgame/client.cpp
                      if(strcmp(text, d->name))
                      {
 -                        if(!isignored(d->clientnum)) conoutf("%s is now known as %s", colorname(d), colorname(d, text));
-+                        if(!isignored(d->clientnum)) conoutf(d->state==CS_SPECTATOR ? CON_INFO|CON_NONZEN : 0, "%s is now known as %s", colorname(d), colorname(d, text));
++                        if(!isignored(d->clientnum)) conoutf(CON_INFO + (d->state==CS_SPECTATOR ? CON_NONZEN : 0), "%s is now known as %s", colorname(d), colorname(d, text));
                          copystring(d->name, text, MAXNAMELEN+1);
                      }
                  }
@@ -137,7 +137,7 @@ Index: src/fpsgame/fps.cpp
          fpsent *d = clients[cn];
          if(!d) return;
 -        if(notify && d->name[0]) conoutf("\f4leave:\f7 %s", colorname(d));
-+        if(notify && d->name[0]) conoutf(d->state==CS_SPECTATOR ? CON_INFO|CON_NONZEN : 0, "\f4leave:\f7 %s", colorname(d));
++        if(notify && d->name[0]) conoutf(CON_INFO + (d->state==CS_SPECTATOR ? CON_NONZEN : 0), "\f4leave:\f7 %s", colorname(d));
          removeweapons(d);
          removetrackedparticles(d);
          removetrackeddynlights(d);
diff --git a/src/fpsgame/client.cpp b/src/fpsgame/client.cpp
index d1ad2ec..7ebb870 100644
--- a/src/fpsgame/client.cpp
+++ b/src/fpsgame/client.cpp
@@ -1453,7 +1453,7 @@ namespace game
                 if(d->name[0])          // already connected
                 {
                     if(strcmp(d->name, text) && !isignored(d->clientnum))
-                        conoutf(d->state==CS_SPECTATOR ? CON_INFO|CON_NONZEN : 0, "%s is now known as %s", colorname(d), colorname(d, text));
+                        conoutf(CON_INFO + (d->state==CS_SPECTATOR ? CON_NONZEN : 0), "%s is now known as %s", colorname(d), colorname(d, text));
                 }
                 else                    // new client
                 {
@@ -1475,7 +1475,7 @@ namespace game
                     if(!text[0]) copystring(text, "unnamed");
                     if(strcmp(text, d->name))
                     {
-                        if(!isignored(d->clientnum)) conoutf(d->state==CS_SPECTATOR ? CON_INFO|CON_NONZEN : 0, "%s is now known as %s", colorname(d), colorname(d, text));
+                        if(!isignored(d->clientnum)) conoutf(CON_INFO + (d->state==CS_SPECTATOR ? CON_NONZEN : 0), "%s is now known as %s", colorname(d), colorname(d, text));
                         copystring(d->name, text, MAXNAMELEN+1);
                     }
                 }
diff --git a/src/fpsgame/fps.cpp b/src/fpsgame/fps.cpp
index d9f2662..7e84ef0 100644
--- a/src/fpsgame/fps.cpp
+++ b/src/fpsgame/fps.cpp
@@ -588,7 +588,7 @@ namespace game
         unignore(cn);
         fpsent *d = clients[cn];
         if(!d) return;
-        if(notify && d->name[0]) conoutf(d->state==CS_SPECTATOR ? CON_INFO|CON_NONZEN : 0, "\f4leave:\f7 %s", colorname(d));
+        if(notify && d->name[0]) conoutf(CON_INFO + (d->state==CS_SPECTATOR ? CON_NONZEN : 0), "\f4leave:\f7 %s", colorname(d));
         removeweapons(d);
         removetrackedparticles(d);
         removetrackeddynlights(d);