[netrek-cvs] server/Vanilla/ntserv daemonII.c, 1.5, 1.6 redraw.c, 1.2, 1.3

[Bill Balcerski]

Update of /cvsroot/netrek/server/Vanilla/ntserv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16900/ntserv

Modified Files:
	daemonII.c redraw.c 
Log Message:
Fix for army capacity difference between client/server.


Index: redraw.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/redraw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- redraw.c	10 Apr 2006 10:56:33 -0000	1.2
+++ redraw.c	14 Apr 2006 10:19:17 -0000	1.3
@@ -412,7 +412,7 @@
 #endif
     pl = me;	/* Not observer, just use my kills */
 
-    troop_capacity = pl->p_kills * (myship->s_type == ASSAULT?3:2);
+    troop_capacity = (int)((float)((int)(pl->p_kills*100)/100.0) * (myship->s_type == ASSAULT?3:2));
     if (myship->s_type == STARBASE || troop_capacity > myship->s_maxarmies)
     	troop_capacity = myship->s_maxarmies;
 

Index: daemonII.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ntserv/daemonII.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- daemonII.c	12 Apr 2006 12:59:24 -0000	1.5
+++ daemonII.c	14 Apr 2006 10:19:17 -0000	1.6
@@ -2944,12 +2944,11 @@
                     continue;
             if (j->p_armies >= j->p_ship.s_maxarmies)
                 continue;
-            /* XXX */
             if (j->p_ship.s_type == ASSAULT) {
-                if (j->p_armies == (int)(j->p_kills * 3.0))
+                if (j->p_armies >= (int)((float)((int)(j->p_kills*100)/100.0) * 3.0))
                     continue;
             } else if (j->p_ship.s_type != STARBASE)
-                if (j->p_armies == (int)(j->p_kills * 2.0))
+                if (j->p_armies >= (int)((float)(int)(j->p_kills*100)/100.0) * 2.0))
                     continue;
             if (j->p_flags & PFORBIT) {
                 if (j->p_team != l->pl_owner)