Mercurial > hg > early-roguelike

changeset 18:95e2bbb7b6e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More conflict. Change log to writelog.
author edwarj4
date Tue, 10 Nov 2009 23:46:48 +0000
parents d67cac79f0f1
children a86ae56e1ed6
files rogue3/command.c rogue3/rip.c rogue3/rogue.h
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rogue3/command.c	Tue Nov 10 22:48:16 2009 +0000
+++ b/rogue3/command.c	Tue Nov 10 23:46:48 2009 +0000
@@ -338,7 +338,7 @@
 	move(LINES-1, 0);
 	draw(stdscr);
 	endwin();
-        log(purse, 1, 0);
+        writelog(purse, 1, 0);
 	score(purse, 1, 0);
 	exit(0);
     }
--- 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);
 }
--- 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);