Michael Thomas 656f3c8
--- src/server/score.c.orig	2006-10-20 11:38:01.000000000 -0700
Michael Thomas 656f3c8
+++ src/server/score.c	2006-10-20 12:44:30.000000000 -0700
Michael Thomas 656f3c8
@@ -257,9 +257,13 @@
Michael Thomas 656f3c8
 		sc = Rate(cannon->score, Get_Score(victim))
Michael Thomas 656f3c8
 		    * options.cannonKillScoreMult;
Michael Thomas 656f3c8
 	    else {
Michael Thomas 656f3c8
-		assert(((object_t *) extra)->id == NO_ID);
Michael Thomas 656f3c8
-		sc = Rate(UNOWNED_SCORE, Get_Score(victim))
Michael Thomas 656f3c8
-		    * options.cannonKillScoreMult;
Michael Thomas 656f3c8
+		//assert(((object_t *) extra)->id == NO_ID);
Michael Thomas 656f3c8
+		if ( ((object_t *) extra)->id != NO_ID) {
Michael Thomas 656f3c8
+                    fprintf(stderr, "((object_t *) extra)->id == NO_ID assertion failed\n");
Michael Thomas 656f3c8
+                } else {
Michael Thomas 656f3c8
+                    sc = Rate(UNOWNED_SCORE, Get_Score(victim))
Michael Thomas 656f3c8
+                        * options.cannonKillScoreMult;
Michael Thomas 656f3c8
+                }
Michael Thomas 656f3c8
 	    }
Michael Thomas 656f3c8
 	} else if (((object_t *) extra)->id == NO_ID) {
Michael Thomas 656f3c8
 	    sc = Rate(0.0,