CVS update: Vanilla/ntserv

[Vanilla CVS Development <tanner@real-time.com>]

Date:	Wednesday May 5, 1999 @ 18:54
Author:	ahn

Update of /home/netrek/cvsroot/Vanilla/ntserv
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv3409/ntserv

Modified Files:
	daemonII.c genspkt.c ltd_stats.c 
Log Message:
Changes by Dave Ahn.  See ChangeLog for details.


****************************************

Index: Vanilla/ntserv/daemonII.c
diff -u Vanilla/ntserv/daemonII.c:1.17 Vanilla/ntserv/daemonII.c:1.18
--- Vanilla/ntserv/daemonII.c:1.17	Fri Apr 30 18:31:30 1999
+++ Vanilla/ntserv/daemonII.c	Wed May  5 18:54:25 1999
@@ -1233,12 +1233,12 @@
                         j->p_subshield += j->p_ship.s_repair * 2;
                     }
                     if (j->p_subshield / 1000) {
-                        j->p_shield += j->p_subshield / 1000;
-                        j->p_subshield %= 1000;
 #ifdef LTD_STATS
                         if (status->tourn)
                             ltd_update_repaired(j, j->p_subshield / 1000);
 #endif
+                        j->p_shield += j->p_subshield / 1000;
+                        j->p_subshield %= 1000;
                     }
                     if (j->p_shield > j->p_ship.s_maxshield) {
                         j->p_shield = j->p_ship.s_maxshield;
@@ -1263,12 +1263,12 @@
 		    j->p_subdamage += j->p_ship.s_repair;
                   }
 		  if (j->p_subdamage / 1000) {
-		    j->p_damage -= j->p_subdamage / 1000;
-		    j->p_subdamage %= 1000;
 #ifdef LTD_STATS
                     if (status->tourn)
                         ltd_update_repaired(j, j->p_subdamage / 1000);
 #endif
+		    j->p_damage -= j->p_subdamage / 1000;
+		    j->p_subdamage %= 1000;
 		  }
 		  if (j->p_damage < 0) {
 		    j->p_damage = 0;
Index: Vanilla/ntserv/genspkt.c
diff -u Vanilla/ntserv/genspkt.c:1.6 Vanilla/ntserv/genspkt.c:1.7
--- Vanilla/ntserv/genspkt.c:1.6	Fri Apr 30 18:31:30 1999
+++ Vanilla/ntserv/genspkt.c	Wed May  5 18:54:25 1999
@@ -2053,27 +2053,27 @@
      */
     if (  stats->tkills   != htonl((long) total_kills) ||
 	  stats->tlosses  != htonl((long) total_deaths) ||
-	  stats->kills    != htonl((long) total_kills) ||
-	  stats->losses   != htonl((long) total_deaths) ||
+	  stats->kills    != htonl((long) 0) ||
+	  stats->losses   != htonl((long) 0) ||
 	  stats->tticks   != htonl((long) total_ticks) ||
 	  stats->tplanets != htonl((long) total_planets_taken) ||
 	  stats->tarmies  != htonl((long) total_armies_bombed) ||
 	  stats->sbkills  != htonl((long) sb_kills) ||
 	  stats->sblosses != htonl((long) sb_deaths) ||
-	  stats->armies   != htonl((long) total_armies_bombed) ||
-	  stats->planets  != htonl((long) total_planets_taken)) {
+	  stats->armies   != htonl((long) 0) ||
+	  stats->planets  != htonl((long) 0)) {
 
 	stats->tkills   = htonl((long) total_kills);
 	stats->tlosses  = htonl((long) total_deaths);
-	stats->kills    = htonl((long) total_kills);
-	stats->losses   = htonl((long) total_deaths);
+	stats->kills    = htonl((long) 0);
+	stats->losses   = htonl((long) 0);
 	stats->tticks   = htonl((long) total_ticks);
 	stats->tplanets = htonl((long) total_planets_taken);
 	stats->tarmies  = htonl((long) total_armies_bombed);
 	stats->sbkills  = htonl((long) sb_kills);
 	stats->sblosses = htonl((long) sb_deaths);
-	stats->armies   = htonl((long) total_armies_bombed);
-	stats->planets  = htonl((long) total_planets_taken);
+	stats->armies   = htonl((long) 0);
+	stats->planets  = htonl((long) 0);
 
 	if ((pl->p_ship.s_type == STARBASE) && (SBhours)) {
 	    stats->maxkills=htonl((long) sb_ticks);
@@ -2095,15 +2095,15 @@
 
 	    s_stats->tkills    = htons(total_kills);
 	    s_stats->tlosses   = htons(total_deaths);
-	    s_stats->kills     = htons(total_kills);
-	    s_stats->losses    = htons(total_deaths);
+	    s_stats->kills     = htons(0);
+	    s_stats->losses    = htons(0);
 	    s_stats->tticks    = htonl(total_ticks);
 	    s_stats->tplanets  = htons(total_planets_taken);
 	    s_stats->tarmies   = htonl(total_armies_bombed);
 	    s_stats->sbkills   = htons(sb_kills);
 	    s_stats->sblosses  = htons(sb_deaths);
-	    s_stats->armies    = htons(total_armies_bombed);
-	    s_stats->planets   = htons(total_planets_taken);
+	    s_stats->armies    = htons(0);
+	    s_stats->planets   = htons(0);
 
 	    if ((pl->p_ship.s_type == STARBASE) && (SBhours)) {
 		s_stats->maxkills=htonl(sb_ticks);
Index: Vanilla/ntserv/ltd_stats.c
diff -u Vanilla/ntserv/ltd_stats.c:1.2 Vanilla/ntserv/ltd_stats.c:1.3
--- Vanilla/ntserv/ltd_stats.c:1.2	Fri Apr 30 18:31:31 1999
+++ Vanilla/ntserv/ltd_stats.c	Wed May  5 18:54:26 1999
@@ -1,4 +1,4 @@
-/* $Id: ltd_stats.c,v 1.2 1999/04/30 23:31:31 ahn Exp $
+/* $Id: ltd_stats.c,v 1.3 1999/05/05 23:54:26 ahn Exp $
  *
  * Dave Ahn
  *
@@ -578,18 +578,9 @@
 
   struct ltd_stats *ltd = ltd_ptr(killer);
 
-  /* first update the max kills for this ship from tourn stats */
-  if (ltd->kills.total > ltd->kills.max) {
-    ltd->kills.max = ltd->kills.total;
+  if (killer->p_kills > ltd->kills.max) {
+    ltd->kills.max = killer->p_kills;
   }
-
-  /* if we're out of tourn, player still gets p_kills.  should we
-     update kills.max with the new p_kills?  NOT FOR NOW. */
-#ifdef _blah
-  if (p->p_kills > ltd->kills.max) {
-    ltd->kills.max = p->p_kills;
-  }
-#endif
 
 }