Use list_context variables instead of homebrewed ODD

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

diff --git a/NDWeb/Pages/MemberIntel.pm b/NDWeb/Pages/MemberIntel.pm
index 36eb09a65a23eeaf524afba812867ffeb585e379..ab73864245bc9ac2566c6117f384d569e13af2ba 100644 (file)
--- a/NDWeb/Pages/MemberIntel.pm
+++ b/NDWeb/Pages/MemberIntel.pm
@@ -73,8 +73,6 @@ sub render_body {
                $query->execute($user->{uid}) or $error .= $DBH->errstr;
                my @nd_attacks;
                my @other_attacks;
-               my $ndi = 0;
-               my $oi = 0;
                while (my $intel = $query->fetchrow_hashref){
                        my $attack = {target => $intel->{coords}, tick => $intel->{tick}};
                        if ($intel->{ndtarget}){
@@ -83,10 +81,8 @@ sub render_body {
                                }else{
                                        $attack->{Other} = 'Launched at a tick that was not claimed';
                                }
-                               $attack->{ODD} = ++$ndi % 2;
                                push @nd_attacks, $attack;
                        }else{
-                               $attack->{ODD} = ++$oi % 2;
                                push @other_attacks, $attack;
                        }
                }
@@ -107,19 +103,13 @@ sub render_body {
                my @nd_def;
                my @ingal_def;
                my @other_def;
-               $ndi = 0;
-               $oi = 0;
-               my $gi = 0;
                while (my $intel = $query->fetchrow_hashref){
                        my $def = {target => $intel->{coords}.(defined $intel->{alliance} ? " ($intel->{alliance})" : ''), tick => $intel->{tick}};
                        if (defined $intel->{alliance_id} && $intel->{alliance_id} == 1){
-                               $def->{ODD} = ++$ndi % 2;
                                push @nd_def, $def;
                        }elsif($intel->{ingal}){
-                               $def->{ODD} = ++$gi % 2;
                                push @ingal_def, $def;
                        }else{
-                               $def->{ODD} = ++$oi % 2;
                                push @other_def, $def;
                        }
                }
@@ -154,10 +144,7 @@ sub render_body {
                        ORDER BY $order DESC});
                $query->execute() or $error .= $DBH->errstr;
                my @members;
-               my $i = 0;
                while (my $intel = $query->fetchrow_hashref){
-                       $i++;
-                       $intel->{ODD} = $i % 2;
                        $intel->{OLD} = 'OLD' if (!defined $intel->{tick} || $self->{TICK} > $intel->{tick} + 60);
                        delete $intel->{tick};
                        push @members,$intel;