From 64ee4a54f4730cdf777d75694ab48280f543ac88 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Thu, 8 Dec 2011 18:12:44 +0000 Subject: More scoping fixes --- Stars45/MapView.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Stars45/MapView.cpp') diff --git a/Stars45/MapView.cpp b/Stars45/MapView.cpp index 1c65d6e..48918d2 100644 --- a/Stars45/MapView.cpp +++ b/Stars45/MapView.cpp @@ -317,12 +317,12 @@ MapView::BuildMenu() ship_menu->AddItem(Game::GetText("MapView.item.Clear-All"), MAP_CLEAR); action_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.ACTION")); - for (i = 0; i < Instruction::NUM_ACTIONS; i++) { + for (int i = 0; i < Instruction::NUM_ACTIONS; i++) { action_menu->AddItem(Game::GetText(Text("MapView.item.") + Instruction::ActionName(i)), MAP_ACTION + i); } formation_menu = new(__FILE__,__LINE__) Menu(Game::GetText("MapView.menu.FORMATION")); - for (i = 0; i < Instruction::NUM_FORMATIONS; i++) { + for (int i = 0; i < Instruction::NUM_FORMATIONS; i++) { formation_menu->AddItem(Game::GetText(Text("MapView.item.") + Instruction::FormationName(i)), MAP_FORMATION + i); } @@ -2598,7 +2598,7 @@ MapView::DrawNavRoute(OrbitalRegion* rgn, int y1 = (ioy-isy); if (draw_bold) { - if (fabs(x1) > fabs(y1)) { + if (x1 > y1) { window->DrawLine(iox, ioy+1, isx, isy+1, s_marker); } else { @@ -2724,7 +2724,7 @@ MapView::DrawNavRoute(OrbitalRegion* rgn, int y1 = (ioy-first_y); if (draw_bold) { - if (fabs(x1) > fabs(y1)) { + if (x1 > y1) { window->DrawLine(iox, ioy+1, first_x, first_y+1, s_marker); } else { -- cgit v1.1