projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Header file cleanup.
[super-star-trek.git]
/
io.c
diff --git
a/io.c
b/io.c
index bff7d46913fe55bedb7b824fb872f16febb60289..e9cc3d7c102c77aa17f151ede5d81b33dbed86ce 100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-9,13
+9,12
@@
#include <time.h>
#include "conio.h"
#include <time.h>
#include "conio.h"
-#include "sstlinux.h"
#include "sst.h"
#ifndef SERGEEV
static int linecount; /* for paging */
#include "sst.h"
#ifndef SERGEEV
static int linecount; /* for paging */
-#endif /* SERGEEV */
static int screenheight = 24, screenwidth = 80;
static int screenheight = 24, screenwidth = 80;
+#endif /* SERGEEV */
#ifndef SERGEEV
static int curses = FALSE;
#else /* SERGEEV */
#ifndef SERGEEV
static int curses = FALSE;
#else /* SERGEEV */
@@
-33,6
+32,7
@@
wnd wnds[6]={{1,1,80,25}, /* FULLSCREEN_WINDOW */
short curwnd;
#endif /* SERGEEV */
short curwnd;
#endif /* SERGEEV */
+#ifndef SERGEEV
static void outro(int sig) {
/* wrap up, either normally or due to signal */
if (curses) {
static void outro(int sig) {
/* wrap up, either normally or due to signal */
if (curses) {
@@
-49,6
+49,7
@@
static void fastexit(int sig) {
putchar('\n');
exit(0);
}
putchar('\n');
exit(0);
}
+#endif /* SERGEEV */
void iostart(int usecurses) {
#ifdef SERGEEV
void iostart(int usecurses) {
#ifdef SERGEEV
@@
-165,9
+166,11
@@
void skip(int i) {
}
#else /* SERGEEV */
while (i-- > 0) proutn("\n\r");
}
#else /* SERGEEV */
while (i-- > 0) proutn("\n\r");
+#endif /* SERGEEV */
}
static void vproutn(char *fmt, va_list ap) {
}
static void vproutn(char *fmt, va_list ap) {
+#ifdef SERGEEV
char *s, *p;
vasprintf(&s, fmt, ap);
p=s;
char *s, *p;
vasprintf(&s, fmt, ap);
p=s;
@@
-253,8
+256,8
@@
static void vprouts(char *fmt, va_list ap) {
}
free(s);
}
}
free(s);
}
-
#endif /* SERGEEV */
#endif /* SERGEEV */
+
void prouts(char *fmt, ...) {
#ifndef SERGEEV
clock_t endTime;
void prouts(char *fmt, ...) {
#ifndef SERGEEV
clock_t endTime;
@@
-345,15
+348,15
@@
void drawmaps(short l) {
if (l==1) sensor();
if (l!=2) setwnd(LEFTUPPER_WINDOW);
gotoxy(1,1);
if (l==1) sensor();
if (l!=2) setwnd(LEFTUPPER_WINDOW);
gotoxy(1,1);
-
strcpy(line,
"s");
- srscan(
1
);
+
enqueue(
"s");
+ srscan(
SCAN_FULL
);
if (l!=2){
setwnd(SRSCAN_WINDOW);
clrscr();
if (l!=2){
setwnd(SRSCAN_WINDOW);
clrscr();
- srscan(
2
);
+ srscan(
SCAN_NO_LEFTSIDE
);
setwnd(LRSCAN_WINDOW);
clrscr();
setwnd(LRSCAN_WINDOW);
clrscr();
-
strcpy(line,
"l");
+
enqueue(
"l");
lrscan();
_setcursortype(_NORMALCURSOR);
}
lrscan();
_setcursortype(_NORMALCURSOR);
}