projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial merge of I/O management.
[super-star-trek.git]
/
io.c
diff --git
a/io.c
b/io.c
index 803e128966654191113de0ee57653d0e3d1dd738..3bc3b9c2c88d225069e90723e3ba96093f871dd8 100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-101,10
+101,10
@@
void clearscreen(void) {
}
void pause_game(int i) {
}
void pause_game(int i) {
+ char *prompt;
#ifndef SERGEEV
#ifndef SERGEEV
-
char buf[BUFSIZ], *prompt
;
+
char buf[BUFSIZ]
;
#else /* SERGEEV */
#else /* SERGEEV */
- char *prompt;
drawmaps(0);
setwnd(5);
#endif /* SERGEEV */
drawmaps(0);
setwnd(5);
#endif /* SERGEEV */
@@
-130,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();
@@
-169,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);
}
@@
-188,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 */
}
@@
-245,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);
@@
-285,11
+286,25
@@
void prouts(char *fmt, ...) {
#endif /* SERGEEV */
}
#endif /* SERGEEV */
}
-#ifndef SERGEEV
-void getline(char *line, int max) {
-#else /* SERGEEV */
-void cgetline(char *line, int max) {
+void warble(void)
+/* sound and visual effects for teleportation */
+{
+#ifdef SERGEEV
+ int posx, posy;
+ posx=wherex();
+ posy=wherey();
+ drawmaps(1);
+ setwnd(4);
+ gotoxy(posx,posy);
+ sound(50);
+ delay(1000);
+ nosound();
+#else
+ prouts(" . . . . . ");
#endif /* SERGEEV */
#endif /* SERGEEV */
+}
+
+void getline(char *line, int max) {
if (curses) {
#ifndef SERGEEV
wgetnstr(stdscr, line, max);
if (curses) {
#ifndef SERGEEV
wgetnstr(stdscr, line, max);