First step towards getting rid of the non-ANSI stuff.

diff --git a/linux.c b/linux.c
index 708f933eb51df9f39ddee8e58e2235def8e6e7bd..d99c738fb9fcf95898896e063e8b38ef39ff7e56 100644 (file)
--- a/linux.c
+++ b/linux.c
@@ -6,13 +6,3 @@ void randomize(void) {
 }
 
 
-int max(int a, int b) {
-       if (a > b) return a;
-       return b;
-}
-
-int min(int a, int b) {
-       if (a < b) return a;
-       return b;
-}
-

diff --git a/makefile b/makefile
index 0a0f9ffc185bb3c9959c2ec1c9649fef82f2ce32..592f4ef2e2f811fbf657a049d2c09ff5f8b3f430 100644 (file)
--- a/makefile
+++ b/makefile
@@ -7,7 +7,7 @@ CFLAGS=     -O -g -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
 .c.o:
        $(CC) $(CFLAGS) -c $<
 
-CFILES= sst.c finish.c reports.c setup.c linux.c moving.c battle.c events.c ai.c planets.c
+CFILES= sst.c finish.c reports.c setup.c moving.c battle.c events.c ai.c planets.c
 OFILES= $(CFILES:.c=.o)
 HFILES=sst.h
 DOCS = README sst-doc.xml sst.xml TODO

diff --git a/os2.c b/os2.c
index e419e297c733dbf608cc98e145709247a6ba346d..1670895bbe5e753e80ef0b9bd2c0c5ed98646541 100644 (file)
--- a/os2.c
+++ b/os2.c
@@ -4,14 +4,3 @@
 void randomize(void) {\r
        srand((int)time(NULL));\r
 }\r
-\r
-\r
-int max(int a, int b) {\r
-       if (a > b) return a;\r
-       return b;\r
-}\r
-\r
-int min(int a, int b) {\r
-       if (a < b) return a;\r
-       return b;\r
-}\r

diff --git a/setup.c b/setup.c
index 5b8c20d2b65c1798caa07f31aa60e515be3b8dda..649774487639b56d45ab29ebd98570cf51b849f8 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -378,6 +378,10 @@ void setup(int needprompt) {
        if (neutz) attack(0);   // bad luck to start in a Romulan Neutral Zone\r
 }\r
 \r
+void randomize(void) {\r
+       srand((int)time(NULL));\r
+}\r
+\r
 int choose(int needprompt) {\r
        tourn = 0;\r
        thawed = 0;\r

diff --git a/sst.c b/sst.c
index 5fc099739e6b9aaaba8fa67de1ce427f04d0606c..ee5bd3eeb3c64ca443c67fc1696a015ec752df79 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -428,7 +428,7 @@ char *cramlc(enum loctype key, int x, int y) {
 void crmena(int i, int enemy, int key, int x, int y) {\r
        if (i == 1) proutn("***");\r
        cramen(enemy);\r
-       proutn(" at");\r
+       proutn(" at ");\r
        proutn(cramlc(key, x, y));\r
 }\r
 \r

diff --git a/sst.h b/sst.h
index 40ba849118746bff69c88b28956aaf0418e974c4..09663191c0fc6c78c9e12880c8f027ca024a62b9 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -8,6 +8,9 @@
 #define EXTERN\r
 #endif\r
 \r
+#define min(x, y)      ((x)<(y)?(x):(y))\r
+#define max(x, y)      ((x)>(y)?(x):(y))\r
+\r
 // #define DEBUG\r
 \r
 #define NDEVICES (15)  // Number of devices\r