projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compute the maximum number of bases from BASEMAX.
[super-star-trek.git]
/
io.c
diff --git
a/io.c
b/io.c
index e14e85366602af9408dd21f5a180a8fc40f00b75..b3d2438d0b3ed289edd7a92c39790b696c5100da 100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-10,14
+10,13
@@
#include "sstlinux.h"
static int linecount; /* for paging */
#include "sstlinux.h"
static int linecount; /* for paging */
-static int curses = TRUE;
WINDOW *curwnd;
static void outro(void)
/* wrap up, either normally or due to signal */
{
WINDOW *curwnd;
static void outro(void)
/* wrap up, either normally or due to signal */
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
clear();
curs_set(1);
(void)refresh();
clear();
curs_set(1);
(void)refresh();
@@
-28,9
+27,9
@@
static void outro(void)
}
}
}
}
-void iostart(
int usecurses
)
+void iostart(
void
)
{
{
- if (
(curses = usecurses)
) {
+ if (
game.options & OPTION_CURSES
) {
if (atexit(outro)){
fprintf(stderr,"Unable to register outro(), exiting...\n");
if (atexit(outro)){
fprintf(stderr,"Unable to register outro(), exiting...\n");
@@
-73,7
+72,7
@@
void iostart(int usecurses)
void waitfor(void)
/* wait for user action -- OK to do nothing if on a TTY */
{
void waitfor(void)
/* wait for user action -- OK to do nothing if on a TTY */
{
- if (
curses
)
+ if (
game.options & OPTION_CURSES
)
getch();
}
getch();
}
@@
-82,19
+81,19
@@
void pause_game(int i)
char *prompt;
char buf[BUFSIZ];
if (i==1) {
char *prompt;
char buf[BUFSIZ];
if (i==1) {
- if (skill >
2
)
+ if (skill >
SKILL_FAIR
)
prompt = "[ANOUNCEMENT ARRIVING...]";
else
prompt = "[IMPORTANT ANNOUNCEMENT ARRIVING -- PRESS ENTER TO CONTINUE]";
}
else {
prompt = "[ANOUNCEMENT ARRIVING...]";
else
prompt = "[IMPORTANT ANNOUNCEMENT ARRIVING -- PRESS ENTER TO CONTINUE]";
}
else {
- if (skill >
2
)
+ if (skill >
SKILL_FAIR
)
prompt = "[CONTINUE?]";
else
prompt = "[PRESS ENTER TO CONTINUE]";
}
prompt = "[CONTINUE?]";
else
prompt = "[PRESS ENTER TO CONTINUE]";
}
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
drawmaps(0);
setwnd(prompt_window);
wclear(prompt_window);
drawmaps(0);
setwnd(prompt_window);
wclear(prompt_window);
@@
-120,7
+119,7
@@
void pause_game(int i)
void skip(int i)
{
while (i-- > 0) {
void skip(int i)
{
while (i-- > 0) {
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
proutn("\n\r");
} else {
linecount++;
proutn("\n\r");
} else {
linecount++;
@@
-134,7
+133,7
@@
void skip(int i)
static void vproutn(char *fmt, va_list ap)
{
static void vproutn(char *fmt, va_list ap)
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
vwprintw(curwnd, fmt, ap);
wrefresh(curwnd);
}
vwprintw(curwnd, fmt, ap);
wrefresh(curwnd);
}
@@
-170,7
+169,7
@@
void prouts(char *fmt, ...)
skip(1);
for (s = buf; *s; s++) {
delay(500);
skip(1);
for (s = buf; *s; s++) {
delay(500);
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
waddch(curwnd, *s);
wrefresh(curwnd);
}
waddch(curwnd, *s);
wrefresh(curwnd);
}
@@
-183,7
+182,7
@@
void prouts(char *fmt, ...)
void cgetline(char *line, int max)
{
void cgetline(char *line, int max)
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
wgetnstr(curwnd, line, max);
strcat(line, "\n");
wrefresh(curwnd);
wgetnstr(curwnd, line, max);
strcat(line, "\n");
wrefresh(curwnd);
@@
-196,7
+195,7
@@
void cgetline(char *line, int max)
void setwnd(WINDOW *wnd)
/* change windows -- OK for this to be a no-op in tty mode */
{
void setwnd(WINDOW *wnd)
/* change windows -- OK for this to be a no-op in tty mode */
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
curwnd=wnd;
curs_set(wnd == fullscreen_window || wnd == message_window || wnd == prompt_window);
}
curwnd=wnd;
curs_set(wnd == fullscreen_window || wnd == message_window || wnd == prompt_window);
}
@@
-205,7
+204,7
@@
void setwnd(WINDOW *wnd)
void clreol (void)
/* clear to end of line -- can be a no-op in tty mode */
{
void clreol (void)
/* clear to end of line -- can be a no-op in tty mode */
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
wclrtoeol(curwnd);
wrefresh(curwnd);
}
wclrtoeol(curwnd);
wrefresh(curwnd);
}
@@
-214,7
+213,7
@@
void clreol (void)
void clrscr (void)
/* clear screen -- can be a no-op in tty mode */
{
void clrscr (void)
/* clear screen -- can be a no-op in tty mode */
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
wclear(curwnd);
wmove(curwnd,0,0);
wrefresh(curwnd);
wclear(curwnd);
wmove(curwnd,0,0);
wrefresh(curwnd);
@@
-224,7
+223,7
@@
void clrscr (void)
void textcolor (int color)
{
#ifdef A_COLOR
void textcolor (int color)
{
#ifdef A_COLOR
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
switch(color) {
case DEFAULT:
wattrset(curwnd, 0);
switch(color) {
case DEFAULT:
wattrset(curwnd, 0);
@@
-284,7
+283,7
@@
void textcolor (int color)
void highvideo (void)
{
void highvideo (void)
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
wattron(curwnd, A_REVERSE);
}
}
wattron(curwnd, A_REVERSE);
}
}
@@
-299,9
+298,9
@@
void commandhook(char *cmd, int before) {
void drawmaps(short l)
/* hook to be called after moving to redraw maps */
{
void drawmaps(short l)
/* hook to be called after moving to redraw maps */
{
- if (
curses
) {
- if (l == 1)
- sensor();
+ if (
game.options & OPTION_CURSES
) {
+ if (l == 1)
+ sensor(
FALSE
);
if (l != 2) {
setwnd(srscan_window);
wmove(curwnd, 0, 0);
if (l != 2) {
setwnd(srscan_window);
wmove(curwnd, 0, 0);
@@
-323,7
+322,7
@@
void drawmaps(short l)
void boom(int ii, int jj)
/* enemy fall down, go boom */
{
void boom(int ii, int jj)
/* enemy fall down, go boom */
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
setwnd(srscan_window);
drawmaps(2);
wmove(srscan_window, ii*2+3, jj+2);
setwnd(srscan_window);
drawmaps(2);
wmove(srscan_window, ii*2+3, jj+2);
@@
-345,7
+344,7
@@
void boom(int ii, int jj)
void warble(void)
/* sound and visual effects for teleportation */
{
void warble(void)
/* sound and visual effects for teleportation */
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
drawmaps(1);
setwnd(message_window);
sound(50);
drawmaps(1);
setwnd(message_window);
sound(50);
@@
-358,7
+357,7
@@
void warble(void)
void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, int iquad)
/* torpedo-track animation */
{
void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, int iquad)
/* torpedo-track animation */
{
- if (!
curses
) {
+ if (!
game.options & OPTION_CURSES
) {
if (l == 1) {
if (n != 1) {
skip(1);
if (l == 1) {
if (n != 1) {
skip(1);
@@
-400,7
+399,7
@@
void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, i
void makechart(void)
{
void makechart(void)
{
- if (
curses
) {
+ if (
game.options & OPTION_CURSES
) {
setwnd(message_window);
wclear(message_window);
chart(0);
setwnd(message_window);
wclear(message_window);
chart(0);
@@
-409,7
+408,7
@@
void makechart(void)
void setpassword(void)
{
void setpassword(void)
{
- if (!
curses
) {
+ if (!
(game.options & OPTION_CURSES)
) {
while (TRUE) {
scan();
strcpy(game.passwd, citem);
while (TRUE) {
scan();
strcpy(game.passwd, citem);