Cleanup as part of Sergeev merge.

diff --git a/conio.c b/conio.c
index adf42e5e58adfd0de2aa8489ab3a20551210f7a3..92598140141e2e12633872e123c3c08ab8fa2965 100644 (file)
--- 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 8b766e9876be9a51ed8e633d4a4d8b360574c2f0..803e128966654191113de0ee57653d0e3d1dd738 100644 (file)
--- 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 1d41c146bf3ae08db8fce5240c06ce9b061f7e30..76b167ddf19f23968bdb6e716b42c2badd7a1a49 100644 (file)
--- 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 ecc3d600299f4c266f85fceef332764d49766f24..8551c8e9534847a94402c77a053ff68691e1867e 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -56,8 +56,6 @@ void preport(void) {
 }\r
 \r
 void orbit(void) {\r
-       double asave;\r
-\r
        skip(1);\r
        chew();\r
        ididit=0;\r

diff --git a/sst.c b/sst.c
index b60b57e5621dab63dc1ff7a0fe888ec49f4e2d3c..050f670edea5668ecae1469b4fe95ad5f9e115f9 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -38,7 +38,7 @@ Here are Tom Almy's changes:
    2. deathray improvement (but keeping original failure alternatives)\r
 \r
    3. Tholian Web\r
-s\r
+\r
    4. Enemies can ram the Enterprise. Regular Klingons and Romulans can\r
       move in Expert and Emeritus games. This code could use improvement.\r
 \r