From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 20 Jan 2005 05:28:41 +0000 (+0000)
Subject: Cleanup as part of Sergeev merge.
X-Git-Tag: 2.0~420
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=222e7873f49cb4b28e872552e8cdc1a8a3e2a605;p=super-star-trek.git

Cleanup as part of Sergeev merge.
---

diff --git a/conio.c b/conio.c
index adf42e5..9259814 100644
--- a/conio.c
+++ b/conio.c
@@ -59,6 +59,7 @@ static void docolor (int color) /* Set DOS-like text mode colors */
    wattron(conio_scr,COLOR_PAIR(1+(color&7)+((color&112)>>1))); 
 }
 
+#ifdef SERGEEV
 /* Call this before any call to linux conio - except the port functions ! */
 void __attribute__((constructor)) initconio (void) /* This is needed, because ncurses needs to be initialized */
 {
@@ -90,6 +91,7 @@ void __attribute__((constructor)) initconio (void) /* This is needed, because nc
    textcolor(7);
    textbackground(0);
 }
+#endif /* SERGEEV */
 
 /* Call this on exiting your program */
 void doneconio (void)
diff --git a/io.c b/io.c
index 8b766e9..803e128 100644
--- a/io.c
+++ b/io.c
@@ -59,11 +59,7 @@ void iostart(int usecurses) {
 	if(signal(SIGQUIT,SIG_IGN) != SIG_IGN)
 	    (void)signal(SIGQUIT,fastexit);
 
-#ifndef SERGEEV
-	if (curses = usecurses) {
-#else /* SERGEEV */
 	if ((curses = usecurses)) {
-#endif /* SERGEEV */
 		(void)initscr();
 #ifdef KEY_MIN
 		keypad(stdscr, TRUE);
diff --git a/makefile b/makefile
index 1d41c14..76b167d 100644
--- a/makefile
+++ b/makefile
@@ -2,11 +2,7 @@
 
 VERS=$(shell sed <sst.spec -n -e '/Version: \(.*\)/s//\1/p')
 
-#ifndef SERGEEV
 CFLAGS=     -O -g -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
-#else /* SERGEEV */
-CFLAGS= -O1 -g -Wall -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
-#endif /* SERGEEV */
 
 .c.o:
 	$(CC) $(CFLAGS) -c $<
diff --git a/planets.c b/planets.c
index ecc3d60..8551c8e 100644
--- a/planets.c
+++ b/planets.c
@@ -56,8 +56,6 @@ void preport(void) {
 }
 
 void orbit(void) {
-	double asave;
-
 	skip(1);
 	chew();
 	ididit=0;
diff --git a/sst.c b/sst.c
index b60b57e..050f670 100644
--- a/sst.c
+++ b/sst.c
@@ -38,7 +38,7 @@ Here are Tom Almy's changes:
    2. deathray improvement (but keeping original failure alternatives)
 
    3. Tholian Web
-s
+
    4. Enemies can ram the Enterprise. Regular Klingons and Romulans can
       move in Expert and Emeritus games. This code could use improvement.