Added new event hooks system and started migrating events to new system

[irc/evilnet/x3.git] / src / chanserv.c

diff --git a/src/chanserv.c b/src/chanserv.c
index c0529b8409721799eccbb41313039a959cfdefd3..2303a76196450c8cc16ceeb9a9f462ec431aaf57 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -679,7 +679,7 @@ enum note_visible_type
     NOTE_VIS_PRIVILEGED
 };
 
-struct io_fd *socket_io_fd;
+extern struct io_fd *socket_io_fd;
 extern struct cManagerNode cManager;
 
 struct note_type
@@ -8027,7 +8027,7 @@ void eightball(char *outcome, int method, unsigned int seed)
    char ballcolors[50][50] = {
         "blue", "red", "green", "yellow",
         "white", "black", "grey", "brown",
-        "yellow", "pink", "purple", "orange", "teal", "burgandy",
+        "yellow", "pink", "purple", "orange", "teal", "burgundy",
         "fuchsia","turquoise","magenta", "cyan"};
 #define NUMOFLOCATIONS 50
    char balllocations[50][55] = { 
@@ -8130,9 +8130,9 @@ static CHANSERV_FUNC(cmd_8ball)
 /*** COLOR *****/
     if((word2) && strcasecmp(word1, "what") == 0 && ((strcasecmp(word2, "color") == 0) || (strcasecmp(word2, "colour") == 0)))
         eightball(eb, 1, accum);
-    else if((word3) && strcasecmp(word1, "what's") == 0 && strcasecmp(word2, "the") == 0 && ((strcasecmp(word2, "color") == 0) || (strcasecmp(word2, "colour") == 0)))
+    else if((word3) && strcasecmp(word1, "what's") == 0 && strcasecmp(word2, "the") == 0 && ((strcasecmp(word3, "color") == 0) || (strcasecmp(word3, "colour") == 0)))
         eightball(eb, 1, accum);
-    else if((word3) && strcasecmp(word1, "whats") == 0 && strcasecmp(word2, "the") == 0 && ((strcasecmp(word2, "color") == 0) || (strcasecmp(word2, "colour") == 0)))
+    else if((word3) && strcasecmp(word1, "whats") == 0 && strcasecmp(word2, "the") == 0 && ((strcasecmp(word3, "color") == 0) || (strcasecmp(word3, "colour") == 0)))
         eightball(eb, 1, accum);
 /*** LOCATION *****/
     else if(