fixed bug when switching to variantsuper
[xboard.git] / zippy.c
diff --git a/zippy.c b/zippy.c
index 5626092..2698ac5 100644 (file)
--- a/zippy.c
+++ b/zippy.c
@@ -412,10 +412,6 @@ int ZippyControl(buf, i)
     char *player, *p;
     char reply[MSG_SIZ];
 
-#if TRIVIA
-#include "trivia.c"
-#endif
-
     /* Possibly reject Crafty as opponent */
     if (appData.zippyPlay && appData.zippyNoplayCrafty && forwardMostMove < 4
        && looking_at(buf, i, "* kibitzes: Hello from Crafty")) 
@@ -680,18 +676,11 @@ int ZippyConverse(buf, i)
            channel++;
          }
          channel[strlen(channel)-1] = NULLCHAR;
-#if 0
-         /* Always tell to the channel (probability 90%) */
-         if (strcmp(player, ics_handle) != 0 &&
-             ((unsigned) random() % 10) < 9) {
-           Speak("tell", channel);
-         }
-#else
+
          /* Tell to the channel only if someone mentions our name */
          if (ZippyCalled(star_match[2])) {
            Speak("tell", channel);
          }
-#endif
 
           ColorizeEx( atoi(channel) == 1 ? ColorChannel1 : ColorChannel, FALSE );
        }