[netrek-cvs] client/netrekxp/src local.c, 1.106, 1.107 map.c, 1.60, 1.61

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18740/src

Modified Files:
	local.c map.c 
Log Message:
Preparation for release.  Macros cleaned up for content and language, release
dates noted.
Minor paradise bug fixes.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- local.c	12 Jun 2007 01:23:18 -0000	1.106
+++ local.c	16 Jul 2007 23:44:18 -0000	1.107
@@ -2841,8 +2841,7 @@
     {
         i = j->p_no;
 
-        if (!j->p_ndrone)
-	    return;
+        if (!j->p_ndrone) continue;
         count = 0;
 
         for (h = i * npthingies; h < npthingies * (i + 1); h++)

Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- map.c	12 Jun 2007 01:23:18 -0000	1.60
+++ map.c	16 Jul 2007 23:44:18 -0000	1.61
@@ -277,6 +277,8 @@
     int i;
     struct player *j;
 
+    if (x < 0 || y < 0) return;
+
     x /= SIZE;
     y /= SIZE;
 
@@ -782,6 +784,7 @@
         && (l->pl_info & me->p_team)
 #ifdef PARADISE
         && (PL_TYPE(*l) != PLSTAR)
+        && (PL_TYPE(*l) != PLWHOLE)
 #endif
         )
         {    
@@ -1603,7 +1606,7 @@
                 mclearacount++;
 
                 /* Check for overwriting planets */
-                checkRedraw(k->t_x, k->t_y);
+                checkRedraw(th->t_x, th->t_y);
             }
 #endif
         }