Mercurial > hg > early-roguelike
comparison 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 |
comparison
equal
deleted
inserted
replaced
17:d67cac79f0f1 | 18:95e2bbb7b6e0 |
---|---|
75 mvaddstr(16, 33, vowelstr(killer)); | 75 mvaddstr(16, 33, vowelstr(killer)); |
76 sprintf(prbuf, "%4d", 1900+lt->tm_year); | 76 sprintf(prbuf, "%4d", 1900+lt->tm_year); |
77 mvaddstr(18, 26, prbuf); | 77 mvaddstr(18, 26, prbuf); |
78 move(LINES-1, 0); | 78 move(LINES-1, 0); |
79 draw(stdscr); | 79 draw(stdscr); |
80 log(purse, 0, monst); | 80 writelog(purse, 0, monst); |
81 score(purse, 0, monst); | 81 score(purse, 0, monst); |
82 /* Make sure all the output gets through ssh and | 82 /* Make sure all the output gets through ssh and |
83 anything else that might be in the way. */ | 83 anything else that might be in the way. */ |
84 printf("[Press return to exit]\n"); | 84 printf("[Press return to exit]\n"); |
85 fflush(NULL); | 85 fflush(NULL); |
312 md_unlockfile(outf); | 312 md_unlockfile(outf); |
313 | 313 |
314 fclose(outf); | 314 fclose(outf); |
315 } | 315 } |
316 | 316 |
317 void log(int amount, int flags, int monst) | 317 void writelog(int amount, int flags, int monst) |
318 { | 318 { |
319 char logmessage[160], ltemp[80]; | 319 char logmessage[160], ltemp[80]; |
320 char *killer; | 320 char *killer; |
321 | 321 |
322 if (waswizard) | 322 if (waswizard) |
471 mvprintw(c - 'a' + 1, 0, "%c) %5d %s", c, worth, inv_name(obj, FALSE)); | 471 mvprintw(c - 'a' + 1, 0, "%c) %5d %s", c, worth, inv_name(obj, FALSE)); |
472 purse += worth; | 472 purse += worth; |
473 } | 473 } |
474 mvprintw(c - 'a' + 1, 0," %5d Gold Peices ", oldpurse); | 474 mvprintw(c - 'a' + 1, 0," %5d Gold Peices ", oldpurse); |
475 refresh(); | 475 refresh(); |
476 log(purse, 2, 0); | 476 writelog(purse, 2, 0); |
477 score(purse, 2, 0); | 477 score(purse, 2, 0); |
478 exit(0); | 478 exit(0); |
479 } | 479 } |
480 | 480 |
481 char * | 481 char * |