diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-08 18:12:44 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-08 18:12:44 +0000 |
| commit | 64ee4a54f4730cdf777d75694ab48280f543ac88 (patch) | |
| tree | a353aa76807bd451c518f70b95c5880f807898cf /Stars45/CampaignMissionStarship.cpp | |
| parent | 4e117fe61651631c7b7427ed584ef3b1f9a7df69 (diff) | |
| download | starshatter-64ee4a54f4730cdf777d75694ab48280f543ac88.zip starshatter-64ee4a54f4730cdf777d75694ab48280f543ac88.tar.gz starshatter-64ee4a54f4730cdf777d75694ab48280f543ac88.tar.bz2 | |
More scoping fixes
Diffstat (limited to 'Stars45/CampaignMissionStarship.cpp')
| -rw-r--r-- | Stars45/CampaignMissionStarship.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Stars45/CampaignMissionStarship.cpp b/Stars45/CampaignMissionStarship.cpp index f0c935f..184ad00 100644 --- a/Stars45/CampaignMissionStarship.cpp +++ b/Stars45/CampaignMissionStarship.cpp @@ -550,7 +550,7 @@ CampaignMissionStarship::CreateSingleElement(CombatGroup* g, CombatUnit* u) elem->AddObjective(obj);
}
}
- else if (u->Type() & Ship::STARSHIPS != 0) {
+ else if ((u->Type() & Ship::STARSHIPS) != 0) {
elem->SetMissionRole(Mission::FLEET);
}
@@ -834,7 +834,7 @@ CampaignMissionStarship::CreateTargetsAssault() player_lead->AddNavPoint(instr);
- for (i = 1; i < player_group_elements.size(); i++) {
+ for (int i = 1; i < player_group_elements.size(); i++) {
MissionElement* pge = player_group_elements[i];
RLoc rloc2;
@@ -921,7 +921,7 @@ CampaignMissionStarship::CreateTargetsPatrol() if (n)
player->AddNavPoint(n);
- for (i = 1; i < player_group_elements.size(); i++) {
+ for (int i = 1; i < player_group_elements.size(); i++) {
MissionElement* elem = player_group_elements[i];
n = new(__FILE__,__LINE__) Instruction(region,
|