X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=raids.pl;h=4480d6bff2a13ba74a3797b3532ba4d0b3b6f268;hb=870325485adff6e11c7d43fd9a3146f943ab735b;hp=672f5aaae79080546493dde8e7b50e7ae255d7de;hpb=6ddfe37eca1405c02aa304b5ada1eb14a3deffb2;p=ndwebbie.git

diff --git a/raids.pl b/raids.pl
index 672f5aa..4480d6b 100644
--- a/raids.pl
+++ b/raids.pl
@@ -33,7 +33,6 @@ sub generateClaimXml {
 	if ($target){
 		$target = "r.id = $target";
 		$_ = listTargets();
-		chop;
 		$BODY->param(TargetList => $_);
 	}else{
 		$target = "r.raid = $raid->{id}";
@@ -158,18 +157,15 @@ if ($XML && $raid && param('cmd') eq 'update' ){
 }
 if ($XML && param('cmd') eq 'gettargets' ){
 	$_ = listTargets();
-	chop;
 	$BODY->param(TargetList => $_);
 }
 
 unless ($XML){
 	$ND::TEMPLATE->param(TITLE => 'Raids');
-	$ND::TEMPLATE->param(HEADER => '<script type="text/javascript" src="raid.js"></script>');
+	#$ND::TEMPLATE->param(HEADER => '<script type="text/javascript" src="raid.js"></script>');
 	if ($raid){#We have a raid, so list all targets
 		$BODY->param(Raid => $raid->{id});
-		my $ajax = 1;
-		#$ajax = 0 if ($ENV{HTTP_USER_AGENT} =~ /MSIE/);
-		$BODY->param(Ajax => $ajax);
+		$BODY->param(Ajax => $ND::AJAX);
 		my $noingal = '';
 		my $planet;
 		if ($ND::PLANET){
@@ -191,7 +187,8 @@ ORDER BY size});
 		while (my $target = $targetquery->fetchrow_hashref){
 			my %target;
 			$target{Id} = $target->{id};
-			$target{Ajax} = $ajax;
+			$target{Race} = $target->{race};
+			$target{Ajax} = $ND::AJAX;
 			my $num = pow(10,length($target->{score})-2);
 			$target{Score} = ceil($target->{score}/$num)*$num;
 			$num = pow(10,length($target->{value})-2);
@@ -239,7 +236,7 @@ ORDER BY size});
 					$xp = max(0,floor($roids * 10 * (min(2,$target{Score}/$planet->{score}) + min(2,$target{Value}/$planet->{value})-1)));
 				}
 				push @roids,{Wave => $i, Roids => $roids, XP => $xp};
-				if ($ajax){
+				if ($ND::AJAX){
 					push @claims,{Wave => $i, Target => $target{Id}}
 				}else{
 					push @claims,{Wave => $i, Target => $target{Id}, Command => 'Claim'