diff -bur megahal.mod/Makefile megahal.mod.new/Makefile
--- megahal.mod/Makefile	Sat Jan 15 21:18:35 2000
+++ megahal.mod.new/Makefile	Thu Jun 21 21:02:04 2001
@@ -1,7 +1,42 @@
-# Source-make
-FILENAME=megahal
-include ../Makefile.generic
-megahal.o: \
-   ../module.h \
-   megahal.h \
-   megahal.c 
+# Makefile for src/mod/megahal.mod/
+# $Id: Makefile,v 1.9 2000/07/09 14:10:49 fabian Exp $
+
+srcdir = .
+
+
+doofus:
+	@echo ""
+	@echo "Let's try this from the right directory..."
+	@echo ""
+	@cd ../../../ && make
+
+static: ../megahal.o
+
+modules: ../../../megahal.$(MOD_EXT)
+
+../megahal.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/megahal.c
+	@rm -f ../megahal.o
+	mv megahal.o ../
+
+../../../megahal.$(MOD_EXT): ../megahal.o
+	$(LD) -o ../../../megahal.$(MOD_EXT) ../megahal.o
+	$(STRIP) ../../../megahal.$(MOD_EXT)
+
+depend:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/megahal.c > .depend
+
+clean:
+	@rm -f .depend *.o *.$(MOD_EXT) *~
+distclean: clean
+
+#safety hash
+../megahal.o: .././megahal.mod/megahal.c ../../../src/mod/module.h \
+ ../../../src/main.h ../../../src/lang.h ../../../src/eggdrop.h \
+ ../../../src/flags.h ../../../src/proto.h ../../../lush.h \
+ ../../../src/misc_file.h ../../../src/cmdt.h ../../../src/tclegg.h \
+ ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
+ ../../../src/compat/compat.h ../../../src/compat/inet_aton.h \
+ ../../../src/compat/snprintf.h ../../../src/compat/memset.h \
+ ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \
+ ../../../src/mod/modvals.h ../../../src/tandem.h
diff -bur megahal.mod/megahal.c megahal.mod.new/megahal.c
--- megahal.mod/megahal.c	Sun Jan 16 23:20:15 2000
+++ megahal.mod.new/megahal.c	Thu Jun 21 20:58:24 2001
@@ -248,7 +248,6 @@
 {
   int size = 0;
 
-  context;
   return size;
 }
 
@@ -292,7 +291,6 @@
 	char prefix[50];
 	struct chanset_t *chan = findchan(channel);
 
-	context;
 	if (chan != NULL) {
 		sprintf(prefix, "PRIVMSG %s :%s: ", channel, nick);
 		do_megahal(DP_HELP, prefix, text);
@@ -302,7 +300,6 @@
 
 static int msg_save_brain(char *nick, char *host, struct userrec *u, char *text)
 {
-	context;
 	putlog(LOG_MISC, "*", "Brain saved by %s", nick);
 	save_model("megahal.brn", model);
 	return 0;
@@ -312,7 +309,6 @@
 {
 	char prefix[50];
 	
-	context;
 	sprintf(prefix, "PRIVMSG %s :", nick);
 	do_megahal(DP_SERVER, prefix, text);
 	return 0;
@@ -321,7 +317,6 @@
 
 static int dcc_megahal(struct userrec *u, int idx, char *par)
 {
-	context;
 	do_megahal(idx, "", par);
 	return 0;
 } 
@@ -329,7 +324,6 @@
 /* a report on the module status */
 static void megahal_report(int idx, int details)
 {
-  context;
   if (details)
     dprintf(idx, "    megahal.so - Port of MegaHAL for Eggdrop bots by _-TNT-_\n");
 }
@@ -354,7 +348,7 @@
 {
 	p_tcl_bind_list H_temp;
 	if ((H_temp = find_bind_table("msg")))
-		add_builtins(H_temp, mega_msg, 2);
+		add_builtins(H_temp, mega_msg);
 	return 0;
 }
 
@@ -362,7 +356,7 @@
 {
 	p_tcl_bind_list H_temp;
 	if ((H_temp = find_bind_table("pub")))
-		add_builtins(H_temp, mega_pub, 1);
+		add_builtins(H_temp, mega_pub);
 	return 0;
 }
 
@@ -376,12 +370,12 @@
 {
 	p_tcl_bind_list H_temp;
 	save_model("megahal.brn", model);
-	rem_builtins(H_load, megahal_load, 2);
-	rem_builtins(H_dcc, mega_dcc, 1);
+	rem_builtins(H_load, megahal_load);
+	rem_builtins(H_dcc, mega_dcc);
 	if ((H_temp = find_bind_table("pub")))
-		rem_builtins(H_temp, mega_pub, 1);
+		rem_builtins(H_temp, mega_pub);
 	if ((H_temp = find_bind_table("msg")))
-		rem_builtins(H_temp, mega_msg, 2);
+		rem_builtins(H_temp, mega_msg);
 	module_undepend(MODULE_NAME);
 	return NULL;
 }
@@ -399,10 +393,9 @@
 char *megahal_start(Function * global_funcs)
 {
 	global = global_funcs;
-	context;
 	module_register(MODULE_NAME, megahal_table, 2, 0);
-	add_builtins(H_load, megahal_load, 2);
-	add_builtins(H_dcc, mega_dcc, 1);
+	add_builtins(H_load, megahal_load);
+	add_builtins(H_dcc, mega_dcc);
 	server_megahal_setup(0);
 	irc_megahal_setup(0);
 	words=new_dictionary();