X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=calls.pl;h=5fa57dff1ae9809ab5055664b5d511812379263f;hb=3d83e79b81e65a009360743155f0324293d13e67;hp=0b843dfdb09dd910ad4e3481cced2294f39a4914;hpb=870325485adff6e11c7d43fd9a3146f943ab735b;p=ndwebbie.git

diff --git a/calls.pl b/calls.pl
index 0b843df..5fa57df 100644
--- a/calls.pl
+++ b/calls.pl
@@ -130,11 +130,12 @@ if ($call){
 		$BODY->param(Ignore => 'Open');
 	}
 	my $fleets = $DBH->prepare(q{
-SELECT id,mission,landing_tick,eta, (landing_tick+eta-1) AS back FROM fleets WHERE uid = ? AND (fleet = 0 OR (landing_tick + eta > ? AND landing_tick - eta - 11 < ? ))
+SELECT id,mission,landing_tick,eta, back FROM fleets WHERE uid = ? AND (fleet = 0 OR (back >= ? AND landing_tick - eta - 11 < ? ))
 ORDER BY fleet ASC});
 	my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE fleet = ?');
 	$fleets->execute($call->{member},$call->{landing_tick},$call->{landing_tick});
 	my @fleets;
+	my $i = 0;
 	while (my $fleet = $fleets->fetchrow_hashref){
 		if ($fleet->{back} == $call->{landing_tick}){
 			$fleet->{Fleetcatch} = 1;
@@ -142,6 +143,8 @@ ORDER BY fleet ASC});
 		$ships->execute($fleet->{id});
 		my @ships;
 		while (my $ship = $ships->fetchrow_hashref){
+			$i++;
+			$ship->{ODD} = $i % 2;
 			push @ships,$ship;
 		}
 		$fleet->{Ships} = \@ships;
@@ -157,7 +160,10 @@ WHERE i.call = ?
 ORDER BY p.x,p.y,p.z});
 	$attackers->execute($call->{id});
 	my @attackers;
+	my $i = 0;
 	while(my $attacker = $attackers->fetchrow_hashref){
+		$i++;
+		$attacker->{ODD} = $i % 2;
 		push @attackers,$attacker;
 	}
 	$BODY->param(Attackers => \@attackers);
@@ -193,6 +199,7 @@ ORDER BY c.landing_tick DESC
 	$query->execute or $error .= $DBH->errstr;
 	my @calls;
 	my $i = 0;
+	my $tick = $ND::TICK;
 	while (my $call = $query->fetchrow_hashref){
 		if ($call->{defense_points} < $minpoints){
 			$call->{DefPrio} = 'LowestPrio';
@@ -201,6 +208,11 @@ ORDER BY c.landing_tick DESC
 		}else{
 			$call->{DefPrio} = 'HighestPrio';
 		}
+		while ($tick - 24 > $call->{landing_tick}){
+			$tick -= 24;
+			push @calls,{};
+			$i = 0;
+		}
 		$i++;
 		$call->{ODD} = $i % 2;
 		$call->{shiptype} = escapeHTML($call->{shiptype});