projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Second round of merging Sergeev changes.
[super-star-trek.git]
/
io.c
diff --git
a/io.c
b/io.c
index 8b766e9876be9a51ed8e633d4a4d8b360574c2f0..258da5513f9bd5eeaf7e14d169925e5bebcd7d15 100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-59,11
+59,7
@@
void iostart(int usecurses) {
if(signal(SIGQUIT,SIG_IGN) != SIG_IGN)
(void)signal(SIGQUIT,fastexit);
if(signal(SIGQUIT,SIG_IGN) != SIG_IGN)
(void)signal(SIGQUIT,fastexit);
-#ifndef SERGEEV
- if (curses = usecurses) {
-#else /* SERGEEV */
if ((curses = usecurses)) {
if ((curses = usecurses)) {
-#endif /* SERGEEV */
(void)initscr();
#ifdef KEY_MIN
keypad(stdscr, TRUE);
(void)initscr();
#ifdef KEY_MIN
keypad(stdscr, TRUE);
@@
-134,7
+130,7
@@
void pause_game(int i) {
wrefresh(stdscr);
} else {
putchar('\n');
wrefresh(stdscr);
} else {
putchar('\n');
- prout(prompt);
+ prout
n
(prompt);
fgets(buf, sizeof(buf), stdin);
if (i != 0) {
clearscreen();
fgets(buf, sizeof(buf), stdin);
if (i != 0) {
clearscreen();
@@
-173,14
+169,14
@@
void skip(int i) {
}
static void vproutn(char *fmt, va_list ap) {
}
static void vproutn(char *fmt, va_list ap) {
- char *s
trbuf, *p, *s
;
- vasprintf(&s
trbuf
, fmt, ap);
- p=s
=strbuf
;
+ char *s
, *p
;
+ vasprintf(&s, fmt, ap);
+ p=s;
if ((curwnd==4)&&(wherey()==wnds[curwnd].wndbottom-wnds[curwnd].wndtop)){
if ((curwnd==4)&&(wherey()==wnds[curwnd].wndbottom-wnds[curwnd].wndtop)){
- if (strchr(s
trbuf,'\n'))
{
- p=strchr(s
trbuf
,'\n');
+ if (strchr(s
,'\n'))
{
+ p=strchr(s,'\n');
p[0]=0;
p[0]=0;
- cprintf("%s",s
trbuf
);
+ cprintf("%s",s);
p++;
pause_game(0);
}
p++;
pause_game(0);
}
@@
-192,7
+188,7
@@
static void vproutn(char *fmt, va_list ap) {
// setwnd(curwnd);
if (strchr(s,'\n') || strchr(s,'\r')) clreol();
cprintf("%s",p);
// setwnd(curwnd);
if (strchr(s,'\n') || strchr(s,'\r')) clreol();
cprintf("%s",p);
- free(s
trbuf
);
+ free(s);
#endif /* SERGEEV */
}
#endif /* SERGEEV */
}
@@
-249,10
+245,11
@@
static void prchr(char *s){
}
static void vprouts(char *fmt, va_list ap) {
}
static void vprouts(char *fmt, va_list ap) {
- char *s;
+ char *s
, *p
;
vasprintf(&s, fmt, ap);
vasprintf(&s, fmt, ap);
- while (*s) {
- prchr(s++);
+ p=s;
+ while (*p) {
+ prchr(p++);
delay(30);
}
free(s);
delay(30);
}
free(s);