X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=sst.c;h=2e1038b0469d7b2a7a9a7f649d22e157daff8ab1;hp=fb508be4ce8e6dacc46618327b1c5b29424e36ab;hb=4be633b9c4830f6cf8c7213c91a31d3ea12f313c;hpb=fb225a29a207cea8436c2deeced27f366492b227

diff --git a/sst.c b/sst.c
index fb508be..2e1038b 100644
--- a/sst.c
+++ b/sst.c
@@ -135,48 +135,44 @@ commands[] = {
 #endif /* SERGEEV */
 #define ORBIT	15
 	{"ORBIT",	ORBIT},
-#define TRANSPORT	17
+#define TRANSPORT	16
 	{"TRANSPORT",	TRANSPORT},
-#define MINE	18
+#define MINE	17
 	{"MINE",	MINE},
-#define CRYSTALS 19
+#define CRYSTALS 18
 	{"CRYSTALS",	CRYSTALS},
-#define SHUTTLE	20
+#define SHUTTLE	19
 	{"SHUTTLE",	SHUTTLE},
-#define PLANETS	21
+#define PLANETS	20
 	{"PLANETS",	PLANETS},
-#ifdef SERGEEV
-#define REQUEST	22
-	{"REQUEST",	REQUEST},
-#endif /* SERGEEV */
-#define REPORT	23
+#define REPORT	21
 	{"REPORT",	REPORT},
-#define COMPUTER	24
+#define COMPUTER	23
 	{"COMPUTER",	COMPUTER},
-#define COMMANDS	25
+#define COMMANDS	24
 	{"COMMANDS",	COMMANDS},
-#define EMEXIT	26
+#define EMEXIT	25
 	{"EMEXIT",	EMEXIT},
-#define PROBE	27
+#define PROBE	26
 	{"PROBE",	PROBE},
-#define SAVE	28
+#define SAVE	27
 	{"SAVE",	SAVE},
 	{"FREEZE",	SAVE},
-#define ABANDON	29
+#define ABANDON	28
 	{"ABANDON",	ABANDON},
-#define DESTRUCT 30
+#define DESTRUCT 29
 	{"DESTRUCT",	DESTRUCT},
-#define DEATHRAY 31
+#define DEATHRAY 30
 	{"DEATHRAY",	DEATHRAY},
-#define DEBUGCMD	32
+#define DEBUGCMD	31
 	{"DEBUG",	DEBUGCMD},
-#define MAYDAY	33
+#define MAYDAY	32
 	{"MAYDAY",	MAYDAY},
 	{"SOS",		MAYDAY},
 	{"CALL",	MAYDAY},
-#define QUIT	34
+#define QUIT	33
 	{"QUIT",	QUIT},
-#define HELP	35
+#define HELP	34
 	{"HELP",	HELP},
 };
 
@@ -203,15 +199,11 @@ static void helpme(void) {
 	key = scan();
 	while (TRUE) {
 		if (key == IHEOL) {
-#ifdef SERGEEV
                         setwnd(BOTTOM_WINDOW);
-#endif /* SERGEEV */
                         proutn("Help on what command? ");
 			key = scan();
 		}
-#ifdef SERGEEV
                 setwnd(LOWER_WINDOW);
-#endif /* SERGEEV */
 		if (key == IHEOL) return;
 		for (i = 0; i < NUMCOMMANDS; i++) {
 		    if (strcasecmp(commands[i].name, citem)==0) {
@@ -272,34 +264,10 @@ static void helpme(void) {
 	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(LEFTUPPER_WINDOW);
-     gotoxy(1,1);
-     strcpy(line,"s");
-     srscan(1);
-     if (l!=2){
-        setwnd(SRSCAN_WINDOW);
-        clrscr();
-        srscan(2);
-        setwnd(LRSCAN_WINDOW);
-        clrscr();
-        strcpy(line,"l");
-        lrscan();
-        _setcursortype(_NORMALCURSOR);
-     }
-#endif /* SERGEEV */
-}
-
 static void makemoves(void) {
 	int i, hitme;
-#ifdef SERGEEV
         clrscr();
         setwnd(LOWER_WINDOW);
-#endif /* SERGEEV */
 	while (TRUE) { /* command loop */
                 drawmaps(1);
                 while (TRUE)  { /* get a command */
@@ -308,10 +276,8 @@ static void makemoves(void) {
 			Time = 0.0;
 			i = -1;
 			chew();
-#ifdef SERGEEV
                         setwnd(BOTTOM_WINDOW);
                         clrscr();
-#endif /* SERGEEV */
 			proutn("COMMAND> ");
                         if (scan() == IHEOL) {
 #ifdef SERGEEV
@@ -323,12 +289,10 @@ static void makemoves(void) {
 #endif /* SERGEEV */
                             continue;
                         }
-#ifdef SERGEEV
                         ididit=0;
                         clrscr();
                         setwnd(LOWER_WINDOW);
                         clrscr();
-#endif /* SERGEEV */
 			for (i=0; i < ABANDON; i++)
 			    if (isit(commands[i].name)) {
 				i = commands[i].value;
@@ -448,9 +412,7 @@ static void makemoves(void) {
 				break;
 			case SAVE:			// Save Game
 				freeze(FALSE);
-#ifdef SERGEEV
                                 clrscr();
-#endif /* SERGEEV */
 				if (skill > 3)
                                         prout("WARNING--Saved games produce no plaques!");
 				break;
@@ -521,14 +483,9 @@ int main(int argc, char **argv) {
 	    }
 	}
 
-#ifndef SERGEEV
-	iostart(usecurses);
-#else
 	randomize();
-        textattr(7);
-        clrscr();
-        setwnd(FULLSCREEN_WINDOW);
-#endif /* SERGEEV */
+	iostart(usecurses);
+
 	line[0] = '\0';
 	for (i = optind; i < argc;  i++) {
 		strcat(line, argv[i]);
@@ -555,15 +512,11 @@ int main(int argc, char **argv) {
 		}
 		proutn("Do you want to play again? ");
 		if (!ja()) break;
-#ifdef SERGEEV
 		setwnd(FULLSCREEN_WINDOW);
 		clrscr();
-#endif /* SERGEEV */
 	}
 	skip(1);
-#ifndef SERGEEV
 	ioend();
-#endif /* SERGEEV */
 	prout("May the Great Bird of the Galaxy roost upon your home planet.");
 	return 0;
 }
@@ -664,15 +617,13 @@ int scan(void) {
 			chew();
 			return IHEOL;
 		}
-		getline(line, sizeof(line));
-#ifdef SERGEEV
+		cgetline(line, sizeof(line));
                 fflush(stdin);
                 if (curwnd==BOTTOM_WINDOW){
                    clrscr();
                    setwnd(LOWER_WINDOW);
                    clrscr();
                 }
-#endif /* SERGEEV */
 		linep = line;
 	}
 	// Skip leading white space