diff rogue3/rogue.h @ 18:95e2bbb7b6e0

More conflict. Change log to writelog.
author edwarj4
date Tue, 10 Nov 2009 23:46:48 +0000
parents d67cac79f0f1
children a86ae56e1ed6
line wrap: on
line diff
--- a/rogue3/rogue.h	Tue Nov 10 22:48:16 2009 +0000
+++ b/rogue3/rogue.h	Tue Nov 10 23:46:48 2009 +0000
@@ -598,7 +598,6 @@
 char *                  killname(int monst);
 void                    lengthen(void (*func)(), int xtime);
 void                    light(coord *cp);
-void                    log(int amount, int flags, int monst);
 void                    look(int wakeup);
 void                    miss(char *er, char *ee);
 void                    missile(int ydelta, int xdelta);
@@ -686,3 +685,4 @@
 void                    wear(void);
 void                    whatis(void);
 void                    wield(void);
+void                    writelog(int amount, int flags, int monst);