diff rogue3/rip.c @ 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/rip.c	Tue Nov 10 22:48:16 2009 +0000
+++ b/rogue3/rip.c	Tue Nov 10 23:46:48 2009 +0000
@@ -77,7 +77,7 @@
     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 @@
     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 @@
     }
     mvprintw(c - 'a' + 1, 0,"   %5d  Gold Peices          ", oldpurse);
     refresh();
-    log(purse, 2, 0);
+    writelog(purse, 2, 0);
     score(purse, 2, 0);
     exit(0);
 }