projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There is a separate STATUS command.
[super-star-trek.git]
/
sst.c
diff --git
a/sst.c
b/sst.c
index c353d04b0621bfe41e97a429c538f25b4aaac314..9e48a03c7d3f05c3c5e223644b544c877c0b0d89 100644
(file)
--- a/
sst.c
+++ b/
sst.c
@@
-10,8
+10,6
@@
#define SSTDOC "sst.doc"
#endif
#define SSTDOC "sst.doc"
#endif
-static char line[128], *linep = line;
-
/*
Here are Tom Almy's changes:
/*
Here are Tom Almy's changes:
@@
-49,106
+47,105
@@
Here are Tom Almy's changes:
6. Perhaps cloaking to be added later? BSD version
6. Perhaps cloaking to be added later? BSD version
-Here are Stas Sergeev's changes (controlled by the proprocessor symbol
-SERGEEV, not yet completely merged):
+Here are Stas Sergeev's changes:
1. The Space Thingy can be shoved, if you it ram, and can fire back if
fired upon.
1. The Space Thingy can be shoved, if you it ram, and can fire back if
fired upon.
-
1
The Tholian can be hit with phasers
+
2.
The Tholian can be hit with phasers
-
2
. When you are docked, base covers you with an almost invincible shields
+
3
. When you are docked, base covers you with an almost invincible shields
(a commander can still ram you, or a Romulan can destroy the base,
or a SCom can even succeed with direct attack IIRC, but this rarely
happens).
(a commander can still ram you, or a Romulan can destroy the base,
or a SCom can even succeed with direct attack IIRC, but this rarely
happens).
-
3
. SCom can't escape from you if no more enemies remain (without this,
-
chasing SCom can take an eternity).
+
4
. SCom can't escape from you if no more enemies remain (without this,
+ chasing SCom can take an eternity).
-
4
. Probe target you enter is now the destination quadrant. Before I don't
-
remember what it was, but it was something I had difficulty using)
+
5
. Probe target you enter is now the destination quadrant. Before I don't
+ remember what it was, but it was something I had difficulty using)
-
5
. Secret password is now autogenerated.
+
6
. Secret password is now autogenerated.
-
6. "Plaque" is adjusted for A4 paper:
)
+
7. "Plaque" is adjusted for A4 paper :-
)
-
7
. Phasers now tells you how much energy needed, but only if the computer
+
8
. Phasers now tells you how much energy needed, but only if the computer
is alive.
is alive.
-
8
. Planets are auto-scanned when you enter the quadrant.
+
9
. Planets are auto-scanned when you enter the quadrant.
-
9
. Mining or using crystals in presense of enemy now yields an attack.
+
10
. Mining or using crystals in presense of enemy now yields an attack.
There are other minor adjustments to what yields an attack
and what does not.
There are other minor adjustments to what yields an attack
and what does not.
-
10
. Ramming a black hole is no longer instant death. There is a
-
chance you might get timewarped instead.
+
11
. Ramming a black hole is no longer instant death. There is a
+ chance you might get timewarped instead.
-
11
. "freeze" command reverts to "save", most people will understand this
+
12
. "freeze" command reverts to "save", most people will understand this
better anyway.
better anyway.
+ 13. Screen-oriented interface, with sensor scans always up.
+
Eric Raymond's changes:
Eric Raymond's changes:
-
1. "sos" and "call" becomes "mayday", "freeze" and "save" are both good.
+ 1. "sos" and "call" becomes "mayday", "freeze" and "save" are both good.
*/
*/
+/* the input queue */
+static char line[128], *linep = line;
+
static struct
{
char *name;
int value;
}
commands[] = {
static struct
{
char *name;
int value;
}
commands[] = {
-#ifndef SERGEEV
#define SRSCAN 1
{"SRSCAN", SRSCAN},
#define SRSCAN 1
{"SRSCAN", SRSCAN},
- {"STATUS", SRSCAN},
-#define LRSCAN 2
+#define STATUS 2
+ {"STATUS", STATUS},
+#define REQUEST 3
+ {"REQUEST", REQUEST},
+#define LRSCAN 4
{"LRSCAN", LRSCAN},
{"LRSCAN", LRSCAN},
-#endif /* SERGEEV */
-#define PHASERS 3
+#define PHASERS 5
{"PHASERS", PHASERS},
{"PHASERS", PHASERS},
-#define TORPEDO
4
+#define TORPEDO
6
{"TORPEDO", TORPEDO},
{"PHOTONS", TORPEDO},
{"TORPEDO", TORPEDO},
{"PHOTONS", TORPEDO},
-#define MOVE
5
+#define MOVE
7
{"MOVE", MOVE},
{"MOVE", MOVE},
-#define SHIELDS
6
+#define SHIELDS
8
{"SHIELDS", SHIELDS},
{"SHIELDS", SHIELDS},
-#define DOCK
7
+#define DOCK
9
{"DOCK", DOCK},
{"DOCK", DOCK},
-#define DAMAGES
8
+#define DAMAGES
10
{"DAMAGES", DAMAGES},
{"DAMAGES", DAMAGES},
-#define CHART
9
+#define CHART
11
{"CHART", CHART},
{"CHART", CHART},
-#define IMPULSE 1
0
+#define IMPULSE 1
2
{"IMPULSE", IMPULSE},
{"IMPULSE", IMPULSE},
-#define REST 1
1
+#define REST 1
3
{"REST", REST},
{"REST", REST},
-#define WARP 1
2
+#define WARP 1
4
{"WARP", WARP},
{"WARP", WARP},
-#define SCORE 1
3
+#define SCORE 1
5
{"SCORE", SCORE},
{"SCORE", SCORE},
-#ifndef SERGEEV
-#define SENSORS 14
+#define SENSORS 16
{"SENSORS", SENSORS},
{"SENSORS", SENSORS},
-#endif /* SERGEEV */
-#define ORBIT 15
+#define ORBIT 17
{"ORBIT", ORBIT},
{"ORBIT", ORBIT},
-#define TRANSPORT 1
7
+#define TRANSPORT 1
8
{"TRANSPORT", TRANSPORT},
{"TRANSPORT", TRANSPORT},
-#define MINE 1
8
+#define MINE 1
9
{"MINE", MINE},
{"MINE", MINE},
-#define CRYSTALS
19
+#define CRYSTALS
20
{"CRYSTALS", CRYSTALS},
{"CRYSTALS", CRYSTALS},
-#define SHUTTLE 2
0
+#define SHUTTLE 2
1
{"SHUTTLE", SHUTTLE},
{"SHUTTLE", SHUTTLE},
-#define PLANETS 2
1
+#define PLANETS 2
2
{"PLANETS", PLANETS},
{"PLANETS", PLANETS},
-#ifdef SERGEEV
-#define REQUEST 22
- {"REQUEST", REQUEST},
-#endif /* SERGEEV */
#define REPORT 23
{"REPORT", REPORT},
#define COMPUTER 24
#define REPORT 23
{"REPORT", REPORT},
#define COMPUTER 24
@@
-164,9
+161,9
@@
commands[] = {
{"FREEZE", SAVE},
#define ABANDON 29
{"ABANDON", ABANDON},
{"FREEZE", SAVE},
#define ABANDON 29
{"ABANDON", ABANDON},
-#define DESTRUCT 30
+#define DESTRUCT
30
{"DESTRUCT", DESTRUCT},
{"DESTRUCT", DESTRUCT},
-#define DEATHRAY 31
+#define DEATHRAY
31
{"DEATHRAY", DEATHRAY},
#define DEBUGCMD 32
{"DEBUG", DEBUGCMD},
{"DEATHRAY", DEATHRAY},
#define DEBUGCMD 32
{"DEBUG", DEBUGCMD},
@@
-180,11
+177,6
@@
commands[] = {
{"HELP", HELP},
};
{"HELP", HELP},
};
-#ifdef SERGEEV
-wnd wnds[6]={{1,1,80,25},{1,1,25,12},{26,2,80,12},{65,1,80,10},{1,13,80,23},{1,24,80,25}};
-short curwnd;
-#endif /* SERGEEV */
-
#define NUMCOMMANDS sizeof(commands)/sizeof(commands[0])
static void listCommands(int x) {
#define NUMCOMMANDS sizeof(commands)/sizeof(commands[0])
static void listCommands(int x) {
@@
-208,15
+200,11
@@
static void helpme(void) {
key = scan();
while (TRUE) {
if (key == IHEOL) {
key = scan();
while (TRUE) {
if (key == IHEOL) {
-#ifdef SERGEEV
- setwnd(5);
-#endif /* SERGEEV */
+ setwnd(BOTTOM_WINDOW);
proutn("Help on what command? ");
key = scan();
}
proutn("Help on what command? ");
key = scan();
}
-#ifdef SERGEEV
- setwnd(4);
-#endif /* SERGEEV */
+ setwnd(LOWER_WINDOW);
if (key == IHEOL) return;
for (i = 0; i < NUMCOMMANDS; i++) {
if (strcasecmp(commands[i].name, citem)==0) {
if (key == IHEOL) return;
for (i = 0; i < NUMCOMMANDS; i++) {
if (strcasecmp(commands[i].name, citem)==0) {
@@
-277,34
+265,14
@@
static void helpme(void) {
fclose(fp);
}
fclose(fp);
}
-void drawmaps(short l) {
-/* hook to be called after moving to redraw maps */
-#ifdef SERGEEV
- _setcursortype(_NOCURSOR);
- if (l==1) sensor();
- if (l!=2) setwnd(1);
- gotoxy(1,1);
- strcpy(line,"s");
- srscan(1);
- if (l!=2){
- setwnd(2);
- clrscr();
- srscan(2);
- setwnd(3);
- clrscr();
- strcpy(line,"l");
- lrscan();
- _setcursortype(_NORMALCURSOR);
- }
-#endif /* SERGEEV */
+void enqueue(char *s) {
+ strcpy(line, s);
}
static void makemoves(void) {
int i, hitme;
}
static void makemoves(void) {
int i, hitme;
-#ifdef SERGEEV
clrscr();
clrscr();
- setwnd(4);
-#endif /* SERGEEV */
+ setwnd(LOWER_WINDOW);
while (TRUE) { /* command loop */
drawmaps(1);
while (TRUE) { /* get a command */
while (TRUE) { /* command loop */
drawmaps(1);
while (TRUE) { /* get a command */
@@
-313,27
+281,17
@@
static void makemoves(void) {
Time = 0.0;
i = -1;
chew();
Time = 0.0;
i = -1;
chew();
-#ifdef SERGEEV
- setwnd(5);
+ setwnd(BOTTOM_WINDOW);
clrscr();
clrscr();
-#endif /* SERGEEV */
proutn("COMMAND> ");
if (scan() == IHEOL) {
proutn("COMMAND> ");
if (scan() == IHEOL) {
-#ifdef SERGEEV
- _setcursortype(_NOCURSOR);
- setwnd(4);
- clrscr();
- chart(0);
- _setcursortype(_NORMALCURSOR);
-#endif /* SERGEEV */
+ makechart();
continue;
}
continue;
}
-#ifdef SERGEEV
ididit=0;
clrscr();
ididit=0;
clrscr();
- setwnd(
4
);
+ setwnd(
LOWER_WINDOW
);
clrscr();
clrscr();
-#endif /* SERGEEV */
for (i=0; i < ABANDON; i++)
if (isit(commands[i].name)) {
i = commands[i].value;
for (i=0; i < ABANDON; i++)
if (isit(commands[i].name)) {
i = commands[i].value;
@@
-351,14
+309,18
@@
static void makemoves(void) {
}
commandhook(commands[i].name, TRUE);
switch (i) { /* command switch */
}
commandhook(commands[i].name, TRUE);
switch (i) { /* command switch */
-#ifndef SERGEEV
case SRSCAN: // srscan
case SRSCAN: // srscan
- srscan(
1
);
+ srscan(
SCAN_FULL
);
break;
break;
+ case STATUS: // status
+ srscan(SCAN_STATUS);
+ break;
+ case REQUEST: // status request
+ srscan(SCAN_REQUEST);
+ break;
case LRSCAN: // lrscan
lrscan();
break;
case LRSCAN: // lrscan
lrscan();
break;
-#endif /* SERGEEV */
case PHASERS: // phasers
phasers();
if (ididit) hitme = TRUE;
case PHASERS: // phasers
phasers();
if (ididit) hitme = TRUE;
@@
-400,11
+362,9
@@
static void makemoves(void) {
case SCORE: // score
score();
break;
case SCORE: // score
score();
break;
-#ifndef SERGEEV
case SENSORS: // sensors
sensor();
break;
case SENSORS: // sensors
sensor();
break;
-#endif /* SERGEEV */
case ORBIT: // orbit
orbit();
if (ididit) hitme = TRUE;
case ORBIT: // orbit
orbit();
if (ididit) hitme = TRUE;
@@
-453,9
+413,7
@@
static void makemoves(void) {
break;
case SAVE: // Save Game
freeze(FALSE);
break;
case SAVE: // Save Game
freeze(FALSE);
-#ifdef SERGEEV
clrscr();
clrscr();
-#endif /* SERGEEV */
if (skill > 3)
prout("WARNING--Saved games produce no plaques!");
break;
if (skill > 3)
prout("WARNING--Saved games produce no plaques!");
break;
@@
-526,14
+484,9
@@
int main(int argc, char **argv) {
}
}
}
}
-#ifndef SERGEEV
- iostart(usecurses);
-#else
randomize();
randomize();
- textattr(7);
- clrscr();
- setwnd(0);
-#endif /* SERGEEV */
+ iostart(usecurses);
+
line[0] = '\0';
for (i = optind; i < argc; i++) {
strcat(line, argv[i]);
line[0] = '\0';
for (i = optind; i < argc; i++) {
strcat(line, argv[i]);
@@
-560,15
+513,11
@@
int main(int argc, char **argv) {
}
proutn("Do you want to play again? ");
if (!ja()) break;
}
proutn("Do you want to play again? ");
if (!ja()) break;
-#ifdef SERGEEV
- setwnd(0);
+ setwnd(FULLSCREEN_WINDOW);
clrscr();
clrscr();
-#endif /* SERGEEV */
}
skip(1);
}
skip(1);
-#ifndef SERGEEV
ioend();
ioend();
-#endif /* SERGEEV */
prout("May the Great Bird of the Galaxy roost upon your home planet.");
return 0;
}
prout("May the Great Bird of the Galaxy roost upon your home planet.");
return 0;
}
@@
-669,15
+618,13
@@
int scan(void) {
chew();
return IHEOL;
}
chew();
return IHEOL;
}
- getline(line, sizeof(line));
-#ifdef SERGEEV
+ cgetline(line, sizeof(line));
fflush(stdin);
fflush(stdin);
- if (curwnd==
5
){
+ if (curwnd==
BOTTOM_WINDOW
){
clrscr();
clrscr();
- setwnd(
4
);
+ setwnd(
LOWER_WINDOW
);
clrscr();
}
clrscr();
}
-#endif /* SERGEEV */
linep = line;
}
// Skip leading white space
linep = line;
}
// Skip leading white space