Time warp forward 34 years so that it compiles (but not work)

[bsdgames-darwin.git] / warp / them.c

diff --git a/warp/them.c b/warp/them.c
index da52e04f27a299db4daa9331a4608b9b92a7f7f3..085e92fb1f8fb8aa51800b9e440276cc77e44b7a 100644 (file)
--- a/warp/them.c
+++ b/warp/them.c
@@ -1,24 +1,6 @@
-/* $Header: /cvsroot/src/games/warp/them.c,v 1.1 2020/11/09 23:37:05 kamil Exp $ */
+/* Header: them.c,v 7.0.1.5 86/12/12 17:05:41 lwall Exp */
 
-/* $Log: them.c,v $
-/* Revision 1.1  2020/11/09 23:37:05  kamil
-/* Add Warp Kit, Version 7.0 by Larry Wall
-/*
-/* Warp is a real-time space war game that doesn't get boring very quickly.
-/* Read warp.doc and the manual page for more information.
-/*
-/* games/warp originally distributed with 4.3BSD-Reno, is back to the BSD
-/* world via NetBSD. Its remnants were still mentioned in games/Makefile.
-/*
-/* Larry Wall, the original author and the copyright holder, generously
-/* donated the game and copyright to The NetBSD Foundation, Inc.
-/*
-/* Import the game sources as-is from 4.3BSD-Reno, with the cession
-/* of the copyright and license to BSD-2-clause NetBSD-style.
-/*
-/* Signed-off-by: Larry Wall <larry@wall.org>
-/* Signed-off-by: Kamil Rytarowski <kamil@netbsd.org>
-/*
+/* Log:        them.c,v
  * Revision 7.0.1.5  86/12/12  17:05:41  lwall
  * Baseline for net release.
  * 
@@ -53,20 +35,20 @@
 #include "them.h"
 
 void
-them_init()
+them_init(void)
 {
     ;
 }
 
 void
-their_smarts()
+their_smarts(void)
 {
-    Reg1 OBJECT *curkl;
-    Reg2 OBJECT *obj;
-    Reg3 int prob;
-    Reg4 int count;
-    Reg5 int y;
-    Reg6 int x;
+    OBJECT *curkl;
+    OBJECT *obj = NULL;
+    int prob;
+    int count;
+    int y = 0;
+    int x = 0;
 
     if (numcrushes && (obj=movers)->type == Crusher) {
        if (numamoebas) {
@@ -321,7 +303,7 @@ their_smarts()
                        fire_torp(curkl,yyy,xxx);
        }
        else if (curkl->image == 'T' && (curkl->velx || curkl->vely)) {
-           Make_object(Web,
+           make_object(Web,
             curkl->vely?
             (curkl->velx?
              (curkl->velx==curkl->vely?
@@ -337,7 +319,7 @@ their_smarts()
            curkl->posy,curkl->posx,0,0,32767L,32767L,&root);
            if (obj && obj->type == Web) {
                unmake_object(obj);
-               occupant[y][x] = Null(OBJECT*);
+               occupant[y][x] = NULL;
            }
        }
     }
@@ -350,16 +332,11 @@ their_smarts()
 }
 
 void
-modify_amoeba(y,x,where,ch,quant)
-Reg1 int y;
-Reg2 int x;
-int where;
-Reg6 int ch;
-Reg7 int quant;
+modify_amoeba(int y, int x, int where, int ch, int quant)
 {
-    Reg3 int dy;
-    Reg4 int dx;
-    Reg5 int count = 15;
+    int dy;
+    int dx;
+    int count = 15;
 
     if (!numamoebas)
        return;
@@ -411,7 +388,7 @@ Reg7 int quant;
                ambsize++;
                yblasted[y] |= 2;
                xblasted[x] |= 2;
-               blasted = TRUE;
+               blasted = true;
            }
            else
                ambsize--;