projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Abstract out damage checks.
[super-star-trek.git]
/
src
/
io.c
diff --git
a/src/io.c
b/src/io.c
index 7b4855f6c88048b78890a477733ae6757018bf96..ecbe87aff9ddb1d373d471a0925f867d41e4dd4a 100644
(file)
--- a/
src/io.c
+++ b/
src/io.c
@@
-38,13
+38,13
@@
void iostart(void)
textdomain(PACKAGE);
gettext("");
textdomain(PACKAGE);
gettext("");
+ if (atexit(outro)){
+ fprintf(stderr,"Unable to register outro(), exiting...\n");
+ exit(1);
+ }
if (!(game.options & OPTION_CURSES)) {
rows = atoi(getenv("LINES"));
} else {
if (!(game.options & OPTION_CURSES)) {
rows = atoi(getenv("LINES"));
} else {
- if (atexit(outro)){
- fprintf(stderr,"Unable to register outro(), exiting...\n");
- exit(1);
- }
(void)initscr();
#ifdef KEY_MIN
keypad(stdscr, TRUE);
(void)initscr();
#ifdef KEY_MIN
keypad(stdscr, TRUE);
@@
-203,7
+203,10
@@
void cgetline(char *line, int max)
strcat(line, "\n");
wrefresh(curwnd);
} else {
strcat(line, "\n");
wrefresh(curwnd);
} else {
- fgets(line, max, stdin);
+ if (replayfp && !feof(replayfp))
+ fgets(line, max, replayfp);
+ else
+ fgets(line, max, stdin);
}
if (logfp)
fputs(line, logfp);
}
if (logfp)
fputs(line, logfp);
@@
-395,7
+398,7
@@
void tracktorpedo(int ix, int iy, int l, int i, int n, int iquad)
skip(1);
proutn("%d - %d ", ix, iy);
} else {
skip(1);
proutn("%d - %d ", ix, iy);
} else {
- if (
game.damage[DSRSENS]==0
|| game.condit==IHDOCKED) {
+ if (
!damaged(DSRSENS)
|| game.condit==IHDOCKED) {
if (i != 1 && l == 1) {
drawmaps(2);
delay(400);
if (i != 1 && l == 1) {
drawmaps(2);
delay(400);