projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another rollup patch.
[super-star-trek.git]
/
src
/
io.c
diff --git
a/src/io.c
b/src/io.c
index dc4ce744fee5cf1350af13c2c991a2096ba46441..c0867fbc9577d21717e02c094b6458d5d669e72a 100644
(file)
--- a/
src/io.c
+++ b/
src/io.c
@@
-1,5
+1,6
@@
#include <stdio.h>
#include <unistd.h>
#include <stdio.h>
#include <unistd.h>
+#include <wchar.h>
#include "config.h"
#include "sst.h"
#include "config.h"
#include "sst.h"
@@
-11,6
+12,7
@@
WINDOW *curwnd;
WINDOW *fullscreen_window;
WINDOW *srscan_window;
WINDOW *report_window;
WINDOW *fullscreen_window;
WINDOW *srscan_window;
WINDOW *report_window;
+WINDOW *status_window;
WINDOW *lrscan_window;
WINDOW *message_window;
WINDOW *prompt_window;
WINDOW *lrscan_window;
WINDOW *message_window;
WINDOW *prompt_window;
@@
-19,12
+21,12
@@
static void outro(void)
/* wrap up, either normally or due to signal */
{
if (game.options & OPTION_CURSES) {
/* wrap up, either normally or due to signal */
{
if (game.options & OPTION_CURSES) {
- clear();
- curs_set(1);
-
(void)
refresh();
-
(void)
resetterm();
- //
(void)
echo();
-
(void)
endwin();
+
//
clear();
+
//
curs_set(1);
+
//
refresh();
+
//
resetterm();
+ //echo();
+ endwin();
putchar('\n');
}
if (logfp)
putchar('\n');
}
if (logfp)
@@
-36,22
+38,22
@@
void iostart(void)
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- gettext("");
if (atexit(outro)){
fprintf(stderr,"Unable to register outro(), exiting...\n");
exit(1);
}
if (!(game.options & OPTION_CURSES)) {
if (atexit(outro)){
fprintf(stderr,"Unable to register outro(), exiting...\n");
exit(1);
}
if (!(game.options & OPTION_CURSES)) {
- rows = atoi(getenv("LINES"));
+ char *ln_env = getenv("LINES");
+ rows = ln_env ? atoi(ln_env) : 25;
} else {
} else {
-
(void)
initscr();
+ initscr();
#ifdef KEY_MIN
keypad(stdscr, TRUE);
#endif /* KEY_MIN */
#ifdef KEY_MIN
keypad(stdscr, TRUE);
#endif /* KEY_MIN */
-
(void)
saveterm();
-
(void)
nonl();
-
(void)
cbreak();
+ saveterm();
+ nonl();
+ cbreak();
#ifdef A_COLOR
{
start_color();
#ifdef A_COLOR
{
start_color();
@@
-65,11
+67,12
@@
void iostart(void)
init_pair(COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
}
#endif /* A_COLOR */
init_pair(COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
}
#endif /* A_COLOR */
- //
(void)
noecho();
+ //noecho();
fullscreen_window = stdscr;
srscan_window = newwin(12, 25, 0, 0);
fullscreen_window = stdscr;
srscan_window = newwin(12, 25, 0, 0);
- report_window = newwin(10, 0, 1, 25);
- lrscan_window = newwin(10, 0, 0, 64);
+ report_window = newwin(11, 0, 1, 25);
+ status_window = newwin(10, 0, 1, 39);
+ lrscan_window = newwin(5, 0, 0, 64);
message_window = newwin(0, 0, 12, 0);
prompt_window = newwin(1, 0, LINES-2, 0);
scrollok(message_window, TRUE);
message_window = newwin(0, 0, 12, 0);
prompt_window = newwin(1, 0, LINES-2, 0);
scrollok(message_window, TRUE);
@@
-86,21
+89,21
@@
void waitfor(void)
getch();
}
getch();
}
-void pause_game(
int i
)
+void pause_game(
bool announcement
)
{
char *prompt;
char buf[BUFSIZ];
{
char *prompt;
char buf[BUFSIZ];
- if (
i==1
) {
+ if (
announcement
) {
if (game.skill > SKILL_FAIR)
if (game.skill > SKILL_FAIR)
- prompt =
"[ANOUNCEMENT ARRIVING...]"
;
+ prompt =
_("[ANOUNCEMENT ARRIVING...]")
;
else
else
- prompt =
"[IMPORTANT ANNOUNCEMENT ARRIVING -- PRESS ENTER TO CONTINUE]"
;
+ prompt =
_("[IMPORTANT ANNOUNCEMENT ARRIVING -- PRESS ENTER TO CONTINUE]")
;
}
else {
if (game.skill > SKILL_FAIR)
}
else {
if (game.skill > SKILL_FAIR)
- prompt =
"[CONTINUE?]"
;
+ prompt =
_("[CONTINUE?]")
;
else
else
- prompt =
"[PRESS ENTER TO CONTINUE]"
;
+ prompt =
_("[PRESS ENTER TO CONTINUE]")
;
}
if (game.options & OPTION_CURSES) {
}
if (game.options & OPTION_CURSES) {
@@
-116,7
+119,7
@@
void pause_game(int i)
putchar('\n');
proutn(prompt);
fgets(buf, sizeof(buf), stdin);
putchar('\n');
proutn(prompt);
fgets(buf, sizeof(buf), stdin);
- if (
i != 0
) {
+ if (
announcement
) {
int j;
for (j = 0; j < rows; j++)
putchar('\n');
int j;
for (j = 0; j < rows; j++)
putchar('\n');
@@
-130,25
+133,23
@@
void skip(int i)
{
while (i-- > 0) {
if (game.options & OPTION_CURSES) {
{
while (i-- > 0) {
if (game.options & OPTION_CURSES) {
- if (curwnd == message_window &&
linecount
>= getmaxy(curwnd) - 3) {
- pause_game(
0
);
+ if (curwnd == message_window &&
getcury(curwnd)
>= getmaxy(curwnd) - 3) {
+ pause_game(
false
);
clrscr();
} else {
proutn("\n");
clrscr();
} else {
proutn("\n");
- if (curwnd == message_window)
- linecount++;
}
} else {
linecount++;
if (linecount >= rows)
}
} else {
linecount++;
if (linecount >= rows)
- pause_game(
0
);
+ pause_game(
false
);
else
putchar('\n');
}
}
}
else
putchar('\n');
}
}
}
-static void vproutn(char *fmt, va_list ap)
+static void vproutn(c
onst c
har *fmt, va_list ap)
{
if (game.options & OPTION_CURSES) {
vwprintw(curwnd, fmt, ap);
{
if (game.options & OPTION_CURSES) {
vwprintw(curwnd, fmt, ap);
@@
-158,7
+159,7
@@
static void vproutn(char *fmt, va_list ap)
vprintf(fmt, ap);
}
vprintf(fmt, ap);
}
-void proutn(char *fmt, ...)
+void proutn(c
onst c
har *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
{
va_list ap;
va_start(ap, fmt);
@@
-166,7
+167,7
@@
void proutn(char *fmt, ...)
va_end(ap);
}
va_end(ap);
}
-void prout(char *fmt, ...)
+void prout(c
onst c
har *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
{
va_list ap;
va_start(ap, fmt);
@@
-175,25
+176,32
@@
void prout(char *fmt, ...)
skip(1);
}
skip(1);
}
-void prouts(char *fmt, ...)
+void prouts(c
onst c
har *fmt, ...)
/* print slowly! */
{
/* print slowly! */
{
- char *s, buf[BUFSIZ];
+ char buf[BUFSIZ];
+ wchar_t *s, mbuf[BUFSIZ];
va_list ap;
va_start(ap, fmt);
vsprintf(buf, fmt, ap);
va_end(ap);
va_list ap;
va_start(ap, fmt);
vsprintf(buf, fmt, ap);
va_end(ap);
- for (s = buf; *s; s++) {
+ mbstowcs(mbuf, buf, BUFSIZ);
+ for (s = mbuf; *s; s++) {
+ /* HOW to convince ncurses to use wchar_t?? */
+ /* WHY putwchar() doesn't work?? */
+ /* OK then, convert back to mbs... */
+ char c[MB_CUR_MAX*2];
+ int n;
+ n = wctomb(c, *s);
+ c[n] = 0;
delay(30);
delay(30);
- if (game.options & OPTION_CURSES) {
- waddch(curwnd, *s);
+ proutn(c);
+ if (game.options & OPTION_CURSES)
wrefresh(curwnd);
wrefresh(curwnd);
- }
- else {
- putchar(*s);
+ else
fflush(stdout);
fflush(stdout);
- }
}
}
+ delay(300);
}
void cgetline(char *line, int max)
}
void cgetline(char *line, int max)
@@
-222,7
+230,7
@@
void setwnd(WINDOW *wnd)
}
}
}
}
-void clreol
(void)
+void clreol(void)
/* clear to end of line -- can be a no-op in tty mode */
{
if (game.options & OPTION_CURSES) {
/* clear to end of line -- can be a no-op in tty mode */
{
if (game.options & OPTION_CURSES) {
@@
-231,7
+239,7
@@
void clreol (void)
}
}
}
}
-void clrscr
(void)
+void clrscr(void)
/* clear screen -- can be a no-op in tty mode */
{
if (game.options & OPTION_CURSES) {
/* clear screen -- can be a no-op in tty mode */
{
if (game.options & OPTION_CURSES) {
@@
-242,7
+250,7
@@
void clrscr (void)
linecount = 0;
}
linecount = 0;
}
-void textcolor
(int color)
+void textcolor(int color)
{
#ifdef A_COLOR
if (game.options & OPTION_CURSES) {
{
#ifdef A_COLOR
if (game.options & OPTION_CURSES) {
@@
-303,7
+311,7
@@
void textcolor (int color)
#endif /* A_COLOR */
}
#endif /* A_COLOR */
}
-void highvideo
(void)
+void highvideo(void)
{
if (game.options & OPTION_CURSES) {
wattron(curwnd, A_REVERSE);
{
if (game.options & OPTION_CURSES) {
wattron(curwnd, A_REVERSE);
@@
-317,50
+325,51
@@
void commandhook(char *cmd, bool before) {
* Things past this point have policy implications.
*/
* Things past this point have policy implications.
*/
-void drawmaps(
short l
)
+void drawmaps(
int mode
)
/* hook to be called after moving to redraw maps */
{
if (game.options & OPTION_CURSES) {
/* hook to be called after moving to redraw maps */
{
if (game.options & OPTION_CURSES) {
- if (
l
== 1)
+ if (
mode
== 1)
sensor();
setwnd(srscan_window);
wmove(curwnd, 0, 0);
sensor();
setwnd(srscan_window);
wmove(curwnd, 0, 0);
- enqueue("no");
- srscan(SCAN_FULL);
- if (l != 2) {
+ srscan();
+ if (mode != 2) {
+ setwnd(status_window);
+ wclear(status_window);
+ wmove(status_window, 0, 0);
setwnd(report_window);
wclear(report_window);
wmove(report_window, 0, 0);
setwnd(report_window);
wclear(report_window);
wmove(report_window, 0, 0);
- s
rscan(SCAN_NO_LEFTSIDE
);
+ s
tatus(0
);
setwnd(lrscan_window);
wclear(lrscan_window);
wmove(lrscan_window, 0, 0);
setwnd(lrscan_window);
wclear(lrscan_window);
wmove(lrscan_window, 0, 0);
- enqueue("l");
lrscan();
}
}
}
lrscan();
}
}
}
-static void put_srscan_sym(
int x, int y
, char sym)
+static void put_srscan_sym(
coord w
, char sym)
{
{
- wmove(srscan_window,
x+1,
y*2+2);
+ wmove(srscan_window,
w.x+1, w.
y*2+2);
waddch(srscan_window, sym);
wrefresh(srscan_window);
}
waddch(srscan_window, sym);
wrefresh(srscan_window);
}
-void boom(
int ii, int jj
)
+void boom(
coord w
)
/* enemy fall down, go boom */
{
if (game.options & OPTION_CURSES) {
drawmaps(2);
setwnd(srscan_window);
wattron(srscan_window, A_REVERSE);
/* enemy fall down, go boom */
{
if (game.options & OPTION_CURSES) {
drawmaps(2);
setwnd(srscan_window);
wattron(srscan_window, A_REVERSE);
- put_srscan_sym(
ii, jj, game.quad[ii][jj
]);
+ put_srscan_sym(
w, game.quad[w.x][w.y
]);
sound(500);
delay(1000);
nosound();
wattroff(srscan_window, A_REVERSE);
sound(500);
delay(1000);
nosound();
wattroff(srscan_window, A_REVERSE);
- put_srscan_sym(
ii, jj, game.quad[ii][jj
]);
+ put_srscan_sym(
w, game.quad[w.x][w.y
]);
delay(500);
setwnd(message_window);
}
delay(500);
setwnd(message_window);
}
@@
-381,46
+390,46
@@
void warble(void)
}
}
}
}
-void tracktorpedo(
int ix, int iy
, int l, int i, int n, int iquad)
+void tracktorpedo(
coord w
, int l, int i, int n, int iquad)
/* torpedo-track animation */
{
if (!game.options & OPTION_CURSES) {
if (l == 1) {
if (n != 1) {
skip(1);
/* torpedo-track animation */
{
if (!game.options & OPTION_CURSES) {
if (l == 1) {
if (n != 1) {
skip(1);
- proutn(
"Track for torpedo number %d- "
, i);
+ proutn(
_("Track for torpedo number %d- ")
, i);
}
else {
skip(1);
}
else {
skip(1);
- proutn(
"Torpedo track- "
);
+ proutn(
_("Torpedo track- ")
);
}
} else if (l==4 || l==9)
skip(1);
}
} else if (l==4 || l==9)
skip(1);
- proutn("%d - %d ",
ix, i
y);
+ proutn("%d - %d ",
w.x, w.
y);
} else {
} else {
- if (
game.damage[DSRSENS]==0 || game.condit==IHDOCKED
) {
+ if (
!damaged(DSRSENS) || game.condition==docked
) {
if (i != 1 && l == 1) {
drawmaps(2);
delay(400);
}
if ((iquad==IHDOT)||(iquad==IHBLANK)){
if (i != 1 && l == 1) {
drawmaps(2);
delay(400);
}
if ((iquad==IHDOT)||(iquad==IHBLANK)){
- put_srscan_sym(
ix, iy
, '+');
+ put_srscan_sym(
w
, '+');
sound(l*10);
delay(100);
nosound();
sound(l*10);
delay(100);
nosound();
- put_srscan_sym(
ix, iy
, iquad);
+ put_srscan_sym(
w
, iquad);
}
else {
wattron(curwnd, A_REVERSE);
}
else {
wattron(curwnd, A_REVERSE);
- put_srscan_sym(
ix, iy
, iquad);
+ put_srscan_sym(
w
, iquad);
sound(500);
delay(1000);
nosound();
wattroff(curwnd, A_REVERSE);
sound(500);
delay(1000);
nosound();
wattroff(curwnd, A_REVERSE);
- put_srscan_sym(
ix, iy
, iquad);
+ put_srscan_sym(
w
, iquad);
}
} else {
}
} else {
- proutn("%d - %d ",
ix, i
y);
+ proutn("%d - %d ",
w.x, w.
y);
}
}
}
}
}
}
@@
-430,24
+439,31
@@
void makechart(void)
if (game.options & OPTION_CURSES) {
setwnd(message_window);
wclear(message_window);
if (game.options & OPTION_CURSES) {
setwnd(message_window);
wclear(message_window);
- chart(0);
+ }
+ chart();
+ if (game.options & OPTION_TTY) {
+ skip(1);
}
}
}
}
-void
setpassword(void)
+void
prstat(const char *txt, const char *fmt, ...)
{
{
- if (!(game.options & OPTION_CURSES)) {
- for (;;) {
- scan();
- strcpy(game.passwd, citem);
- chew();
- if (*game.passwd != 0) break;
- proutn("Please type in a secret password-");
- }
- } else {
- int i;
- for(i=0;i<3;i++) game.passwd[i]=(char)(97+(int)(Rand()*25));
- game.passwd[3]=0;
+#define NSYM 14
+ int i;
+ va_list args;
+ proutn(txt);
+ if (game.options & OPTION_CURSES) {
+ skip(1);
+ } else {
+ for (i = mblen(txt, strlen(txt)); i < NSYM; i++)
+ proutn(" ");
}
}
+ if (game.options & OPTION_CURSES)
+ setwnd(status_window);
+ va_start(args, fmt);
+ vproutn(fmt, args);
+ va_end(args);
+ skip(1);
+ if (game.options & OPTION_CURSES)
+ setwnd(report_window);
}
}
-