From acb1a4fce903f11c2b1104287b7ae92c130c7b6c Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Tue, 10 Nov 2009 23:46:48 +0000
Subject: [PATCH] More conflict.  Change log to writelog.

---
 rogue3/command.c | 2 +-
 rogue3/rip.c     | 6 +++---
 rogue3/rogue.h   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rogue3/command.c b/rogue3/command.c
index e6825eb..9cd592c 100644
--- a/rogue3/command.c
+++ b/rogue3/command.c
@@ -338,7 +338,7 @@ quit(int p)
 	move(LINES-1, 0);
 	draw(stdscr);
 	endwin();
-        log(purse, 1, 0);
+        writelog(purse, 1, 0);
 	score(purse, 1, 0);
 	exit(0);
     }
diff --git a/rogue3/rip.c b/rogue3/rip.c
index c9af634..b6c0a89 100644
--- a/rogue3/rip.c
+++ b/rogue3/rip.c
@@ -77,7 +77,7 @@ death(int monst)
     mvaddstr(18, 26, prbuf);
     move(LINES-1, 0);
     draw(stdscr);
-    log(purse, 0, monst);
+    writelog(purse, 0, monst);
     score(purse, 0, monst);
     /* Make sure all the output gets through ssh and
        anything else that might be in the way. */
@@ -314,7 +314,7 @@ score(int amount, int flags, int monst)
     fclose(outf);
 }
 
-void log(int amount, int flags, int monst)
+void writelog(int amount, int flags, int monst)
 {
     char logmessage[160], ltemp[80];
     char *killer;
@@ -473,7 +473,7 @@ total_winner()
     }
     mvprintw(c - 'a' + 1, 0,"   %5d  Gold Peices          ", oldpurse);
     refresh();
-    log(purse, 2, 0);
+    writelog(purse, 2, 0);
     score(purse, 2, 0);
     exit(0);
 }
diff --git a/rogue3/rogue.h b/rogue3/rogue.h
index 93602ca..fb15145 100644
--- a/rogue3/rogue.h
+++ b/rogue3/rogue.h
@@ -598,7 +598,6 @@ void                    killed(struct linked_list *item, int pr);
 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                    waste_time(void);
 void                    wear(void);
 void                    whatis(void);
 void                    wield(void);
+void                    writelog(int amount, int flags, int monst);