curses interface is now partly working.

diff --git a/events.c b/events.c
index c3f22f5d0996b7d0b1d43384c4471e6fba3dbb6e..940ad7b54e126d03834a0b118ca1d02f52c52b4c 100644 (file)
--- a/events.c
+++ b/events.c
@@ -580,7 +580,7 @@ void nova(int ix, int iy) {
        skip(1);\r
        prout("Force of nova displaces starship.");\r
        iattak=2;       /* Eliminates recursion problem */\r
-       move();\r
+       imove();\r
        Time = 10.0*dist/16.0;\r
        return;\r
 }\r
@@ -635,7 +635,7 @@ void snova(int insx, int insy) {
                        if (game.damage[DRADIO] == 0.0 || condit == IHDOCKED) {\r
                                skip(1);\r
                                prout("Message from Starfleet Command       Stardate %.2f", game.state.date);\r
-                               proutn("     Supernova in %s; caution advised.",\r
+                               prout("     Supernova in %s; caution advised.",\r
                                       cramlc(quadrant, nqx, nqy));\r
                        }\r
                }\r

diff --git a/makefile b/makefile
index f98e173cd02512da078e185cfe200d57d834940c..cf29f5afcbd7a56d2cb14fd58744139aa84074cc 100644 (file)
--- a/makefile
+++ b/makefile
@@ -18,7 +18,7 @@ SOURCES= $(CFILES) $(HFILES) $(DOCS) sst.doc sst.6 makehelp.py makefile sst.spec
 all: sst sst.doc
 
 sst:  $(OFILES)
-       gcc  -o sst $(OFILES) -lm
+       gcc  -o sst $(OFILES) -lm -lcurses
 
 $(OFILES):  $(HFILES)
 

diff --git a/moving.c b/moving.c
index c48ded55789c8ccbd9c472482910857dc5f21d92..07eb148b3eecdbc0eb4c9af5925aac61ff736c82 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -2,7 +2,7 @@
 \r
 static void getcd(int, int);\r
 \r
-void move(void) {\r
+void imove(void) {\r
        double angle, deltax, deltay, bigger, x, y,\r
        finald, finalx, finaly, stopegy;\r
        int trbeam = 0, n, l, ix, iy, kink, kinks, iquad;\r
@@ -447,7 +447,7 @@ void impuls(void) {
                if (ja() == 0) return;\r
        }\r
        /* Activate impulse engines and pay the cost */\r
-       move();\r
+       imove();\r
        ididit = 1;\r
        if (alldone) return;\r
        power = 20.0 + 100.0*dist;\r
@@ -575,7 +575,7 @@ void warp(int i) {
                                \r
 \r
        /* Activate Warp Engines and pay the cost */\r
-       move();\r
+       imove();\r
        if (alldone) return;\r
        energy -= dist*warpfac*warpfac*warpfac*(shldup+1);\r
        if (energy <= 0) finish(FNRG);\r

diff --git a/reports.c b/reports.c
index f98c35c25ce617bfae95c7e14fc96b51951f7d37..e398e776d5c8530b91e00999830ffc5274d390fd 100644 (file)
--- a/reports.c
+++ b/reports.c
@@ -130,7 +130,7 @@ void lrscan(void) {
                                game.starch[x][y] = game.damage[DRADIO] > 0 ? game.state.galaxy[x][y]+1000 :1;\r
                        }\r
                }\r
-               putchar('\n');\r
+               skip(1);\r
        }\r
 \r
 }\r

diff --git a/sst.c b/sst.c
index f65a2a5e70aaabd347b0a44ce0920b63238a1080..8d82100865f63fd1a37f9581e18906a7cc703939 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -348,8 +348,8 @@ int main(int argc, char **argv) {
        int hitme;\r
        char ch;\r
 \r
-       prelim(); \r
        iostart();\r
+       prelim(); \r
        line[0] = '\0';\r
        if (argc > 1) {\r
                while (--argc > 0) {\r
@@ -380,7 +380,8 @@ int main(int argc, char **argv) {
                if (!ja()) break;\r
        }\r
        skip(1);\r
-       prout("May the Great Bird of the Galaxy roost upon your home planet.");\r
+       ioend();\r
+       puts("May the Great Bird of the Galaxy roost upon your home planet.");\r
 }\r
 \r
 \r

diff --git a/sst.h b/sst.h
index b5ad3e4690b34931f8e9544649698e895987b156..f9eb043c2a73f1718377e0977e0eca5ae81dce75 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -316,8 +316,10 @@ char *device[NDEVICES+1] = {
     "D. S. Probe"};                                                                    \r
 #endif\r
 \r
+#ifndef TRUE\r
 #define TRUE (1)\r
 #define FALSE (0)\r
+#endif\r
 \r
 #define IHR 'R'\r
 #define IHK 'K'\r
@@ -392,7 +394,7 @@ double square(double);
 void dropin(int, int*, int*);\r
 void newcnd(void);\r
 void sortkl(void);\r
-void move(void);\r
+void imove(void);\r
 void ram(int, int, int, int);\r
 void crmena(int, int, int, int, int);\r
 void deadkl(int, int, int, int, int);\r
@@ -422,4 +424,5 @@ void movetho(void);
 void probe(void);\r
 void clearscreen(void);\r
 void iostart(void);\r
+void ioend(void);\r
 void getline(char *, int);\r