Use list_context variables instead of homebrewed ODD

[ndwebbie.git] / NDWeb / Pages / Main.pm

diff --git a/NDWeb/Pages/Main.pm b/NDWeb/Pages/Main.pm
index 8bcbdc4b6cc8f7df549dc452bfe4e51673280752..db3a11c7db65d0b56844c3492463ccc2b22d2bb9 100644 (file)
--- a/NDWeb/Pages/Main.pm
+++ b/NDWeb/Pages/Main.pm
@@ -162,7 +162,6 @@ sub render_body {
                })or warn  $DBH->errstr;
        $calls->execute($ND::UID) or warn $DBH->errstr;
 
-       my $i = 0;
        my @calls;
        while (my $call = $calls->fetchrow_hashref){
                $call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
@@ -175,9 +174,7 @@ sub render_body {
                }else{
                        $call->{covered} = 'Hostile';
                }
-               $i++;
-               $call->{ODD} = $i % 2;
-               $call->{shiptype} = escapeHTML($call->{shiptype});
+               $call->{shiptype} = $call->{shiptype};
                push @calls, $call;
        }
        $BODY->param(Calls => \@calls);
@@ -227,14 +224,10 @@ ORDER BY x,y,z,mission,tick
 
        $query->execute($self->{UID},$self->{PLANET},$self->{TICK}) or warn $DBH->errstr;
        my @fleets;
-       $i = 0;
        while (my $fleet = $query->fetchrow_hashref){
-               $fleet->{ODD} = $i++ % 2;
                my @ships;
                $ships->execute($fleet->{id});
-               my $j = 0;
                while (my $ship = $ships->fetchrow_hashref){
-                       $ship->{ODD} = $j++ % 2;
                        push @ships,$ship;
                }
                $fleet->{ships} = \@ships;