* Fixed hack for color() in modules

svn: 566

src/mod/console.mod/console.c

@@ -23,7 +23,7 @@ struct console_info {
   int echoflags;
   int page;
   int conchan;
-  int color;
+  int colour;
 };
 
 static struct user_entry_type USERENTRY_CONSOLE;
@@ -49,7 +49,7 @@ static int console_unpack(struct userrec *u, struct user_entry *e)
   arg = newsplit(&par);
   ci->conchan = atoi(arg);
   arg = newsplit(&par);
-  ci->color = atoi(arg);
+  ci->colour = atoi(arg);
   list_type_kill(e->u.list);
   e->u.extra = ci;
   return 1;
@@ -66,7 +66,7 @@ static int console_pack(struct userrec *u, struct user_entry *e)
   l = simple_sprintf(work, "%s %s %s %d %d %d %d",
 		     ci->channel, masktype(ci->conflags),
 		     stripmasktype(ci->stripflags), ci->echoflags,
-		     ci->page, ci->conchan, ci->color);
+		     ci->page, ci->conchan, ci->colour);
 
   e->u.list = user_malloc(sizeof(struct list_type));
   e->u.list->next = NULL;
@@ -96,7 +96,7 @@ static int console_write_userfile(FILE *f, struct userrec *u,
   if (lfprintf(f, "--CONSOLE %s %s %s %d %d %d %d\n",
 	      i->channel, masktype(i->conflags),
 	      stripmasktype(i->stripflags), i->echoflags,
-	      i->page, i->conchan, i->color) == EOF)
+	      i->page, i->conchan, i->colour) == EOF)
     return 0;
   return 1;
 }
@@ -120,7 +120,7 @@ static int console_set(struct userrec *u, struct user_entry *e, void *buf)
     char string[501];    
     egg_snprintf(string, sizeof string, "%s %s %s %d %d %d %d", ci->channel, masktype(ci->conflags), 
                                     stripmasktype(ci->stripflags), ci->echoflags, ci->page, ci->conchan,
-                                    ci->color);
+                                    ci->colour);
     /* shareout(NULL, "c %s %s %s\n", e->type->name, u->handle, string); */
     shareout(NULL, "c CONSOLE %s %s\n", u->handle, string);
   }
@@ -152,7 +152,7 @@ static int console_gotshare(struct userrec *u, struct user_entry *e, char *par,
   arg = newsplit(&par);
   ci->conchan = atoi(arg);
   arg = newsplit(&par);
-  ci->color = atoi(arg);
+  ci->colour = atoi(arg);
   e->u.extra = ci;
   /* now let's propogate to the dcc list */
   for (i = 0; i < dcc_total; i++) {
@@ -171,7 +171,7 @@ static int console_gotshare(struct userrec *u, struct user_entry *e, char *par,
         if (!dcc[i].u.chat->line_count)
           dcc[i].u.chat->current_lines = 0;
       }
-      if (ci->color)
+      if (ci->colour)
         dcc[i].status |= (STAT_COLOR);
       else
         dcc[i].status &= ~(STAT_COLOR);
@@ -189,7 +189,7 @@ static int console_tcl_get(Tcl_Interp *irp, struct userrec *u,
   simple_sprintf(work, "%s %s %s %d %d %d %d",
 		 i->channel, masktype(i->conflags),
 		 stripmasktype(i->stripflags), i->echoflags,
-		 i->page, i->conchan, i->color);
+		 i->page, i->conchan, i->colour);
   Tcl_AppendResult(irp, work, NULL);
   return TCL_OK;
 }
@@ -224,7 +224,7 @@ static int console_tcl_set(Tcl_Interp *irp, struct userrec *u,
 	  if (argc > 8) {
 	    i->conchan = atoi(argv[8]);
             if (argc > 9)
-              i->color = atoi(argv[9]);
+              i->colour = atoi(argv[9]);
           }  
 	}
       }
@@ -256,7 +256,7 @@ static void console_display(int idx, struct user_entry *e, struct userrec *u)
             CONSOLE_CHANNEL2, (i->conchan < GLOBAL_CHANS) ? "" : "*",
             i->conchan % GLOBAL_CHANS);
     sprintf(tmp, "    Color:");
-    if (i->color == 1)
+    if (i->colour == 1)
      sprintf(tmp, "%s on", tmp);
     else
      sprintf(tmp, "%s off", tmp);
@@ -315,7 +315,7 @@ static int console_chon(char *handle, int idx)
 	if (!dcc[idx].u.chat->line_count)
 	  dcc[idx].u.chat->current_lines = 0;
       }
-      if (i->color)
+      if (i->colour)
         dcc[idx].status |= (STAT_COLOR);
       else
         dcc[idx].status &= ~(STAT_COLOR);
@@ -365,9 +365,9 @@ static int console_store(struct userrec *u, int idx, char *par)
   else
     i->page = 0;
   if (dcc[idx].status & STAT_COLOR)
-    i->color = 1;
+    i->colour = 1;
   else
-    i->color = 0;
+    i->colour = 0;
   i->conchan = dcc[idx].u.chat->channel;
   if (par) {
     char tmp[100];
@@ -380,7 +380,7 @@ static int console_store(struct userrec *u, int idx, char *par)
     dprintf(idx, "  %s %d, %s %d\n", CONSOLE_PAGE_SETTING, i->page,
             CONSOLE_CHANNEL2, i->conchan);
     sprintf(tmp, "    Color:");
-    if (i->color == 1)
+    if (i->colour == 1)
      sprintf(tmp, "%s on", tmp);
     else
      sprintf(tmp, "%s off", tmp);

src/mod/module.h

@@ -360,7 +360,7 @@
 /* 204 - 207 */
 #define online_since (*(int *)(global[204]))
 #define buildts (*(const time_t*)(global[205]))
-#define colorI ((char *(*)(int, int, int))global[206])
+#define color ((char *(*)(int, int, int))global[206])
 #define check_dcc_attrs ((int (*)(struct userrec *,int))global[207])
 /* 208 - 211 */
 #define check_dcc_chanattrs ((int (*)(struct userrec *,char *,int,int))global[208])