diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-09 14:12:12 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-09 14:12:12 +0000 |
| commit | c45ce5cc4e54bdae2fd45a130d8957ec55b51b1b (patch) | |
| tree | e7ac533ff4006d455246d4e6d85a87f1966b9dd4 /Stars45 | |
| parent | ef83cdced6bc0fd4ee94f03237ad0201ef012a6b (diff) | |
| download | starshatter-c45ce5cc4e54bdae2fd45a130d8957ec55b51b1b.zip starshatter-c45ce5cc4e54bdae2fd45a130d8957ec55b51b1b.tar.gz starshatter-c45ce5cc4e54bdae2fd45a130d8957ec55b51b1b.tar.bz2 | |
A few fixes recommended by PVS Studio
Diffstat (limited to 'Stars45')
| -rw-r--r-- | Stars45/CampaignMissionFighter.cpp | 2 | ||||
| -rw-r--r-- | Stars45/CampaignMissionStarship.cpp | 4 | ||||
| -rw-r--r-- | Stars45/CampaignPlanMovement.cpp | 4 | ||||
| -rw-r--r-- | Stars45/RadioHandler.cpp | 5 | ||||
| -rw-r--r-- | Stars45/Ship.cpp | 4 | ||||
| -rw-r--r-- | Stars45/Sim.cpp | 20 |
6 files changed, 18 insertions, 21 deletions
diff --git a/Stars45/CampaignMissionFighter.cpp b/Stars45/CampaignMissionFighter.cpp index f859ad8..bbb2d43 100644 --- a/Stars45/CampaignMissionFighter.cpp +++ b/Stars45/CampaignMissionFighter.cpp @@ -620,7 +620,7 @@ CampaignMissionFighter::CreateSingleElement(CombatGroup* g, CombatUnit* u) Instruction* obj = new(__FILE__,__LINE__) Instruction(Instruction::VECTOR, dst + "-" + src);
elem->AddObjective(obj);
}
- else if (u->Type() & Ship::STARSHIPS != 0) {
+ else if ((u->Type() & Ship::STARSHIPS) != 0) {
elem->SetMissionRole(Mission::FLEET);
}
diff --git a/Stars45/CampaignMissionStarship.cpp b/Stars45/CampaignMissionStarship.cpp index 184ad00..74eb2be 100644 --- a/Stars45/CampaignMissionStarship.cpp +++ b/Stars45/CampaignMissionStarship.cpp @@ -875,7 +875,7 @@ CampaignMissionStarship::CreateTargetsCarrier() RandomDirection() * Random( 50e3, 100e3);
- int ntargets = 2 + RandomChance() ? 1 : 0;
+ int ntargets = 2 + (RandomChance() ? 1 : 0);
int ntries = 8;
while (ntargets > 0 && ntries > 0) {
@@ -932,7 +932,7 @@ CampaignMissionStarship::CreateTargetsPatrol() elem->AddNavPoint(n);
}
- int ntargets = 2 + RandomChance() ? 1 : 0;
+ int ntargets = 2 + (RandomChance() ? 1 : 0);
int ntries = 8;
while (ntargets > 0 && ntries > 0) {
diff --git a/Stars45/CampaignPlanMovement.cpp b/Stars45/CampaignPlanMovement.cpp index dc08798..1333503 100644 --- a/Stars45/CampaignPlanMovement.cpp +++ b/Stars45/CampaignPlanMovement.cpp @@ -136,7 +136,7 @@ CampaignPlanMovement::MoveUnit(CombatUnit* u) if (unit->GetCombatGroup() != u->GetCombatGroup() && unit->GetRegion() == u->GetRegion() && !unit->IsDropship()) {
Point delta = loc - unit->Location();
- double dist = delta.Normalize();
+ dist = delta.Normalize();
if (dist < closest_dist) {
closest_unit = unit;
@@ -147,7 +147,7 @@ CampaignPlanMovement::MoveUnit(CombatUnit* u) if (closest_unit && closest_dist < MIN_DIST) {
Point delta = loc - closest_unit->Location();
- double dist = delta.Normalize();
+ dist = delta.Normalize();
loc += delta * 1.1 * (MIN_DIST - closest_dist);
diff --git a/Stars45/RadioHandler.cpp b/Stars45/RadioHandler.cpp index e56c850..d6397fc 100644 --- a/Stars45/RadioHandler.cpp +++ b/Stars45/RadioHandler.cpp @@ -71,10 +71,7 @@ RadioHandler::ProcessMessage(RadioMessage* msg, Ship* s) if (msg->Action() == RadioMessage::SKIP_NAVPOINT && !respond)
ProcessMessageAction(msg, s);
- if (ProcessMessageOrders(msg, s))
- respond = respond && true;
-
- else
+ if (!ProcessMessageOrders(msg, s))
respond = respond && ProcessMessageAction(msg, s);
return respond;
diff --git a/Stars45/Ship.cpp b/Stars45/Ship.cpp index f2ded5a..50555d2 100644 --- a/Stars45/Ship.cpp +++ b/Stars45/Ship.cpp @@ -4895,7 +4895,7 @@ Ship::ExecMaintFrame(double seconds) if (pwr != src) {
List<System> xfer;
- for (int j = 0; j < pwr->Clients().size(); i++) {
+ for (int j = 0; j < pwr->Clients().size(); j++) {
System* s = pwr->Clients().at(j);
if (s->GetSourceIndex() == isrc) {
@@ -4903,7 +4903,7 @@ Ship::ExecMaintFrame(double seconds) }
}
- for (int j = 0; j < xfer.size(); i++) {
+ for (int j = 0; j < xfer.size(); j++) {
System* s = xfer.at(j);
pwr->RemoveClient(s);
src->AddClient(s);
diff --git a/Stars45/Sim.cpp b/Stars45/Sim.cpp index b054b72..978ad6a 100644 --- a/Stars45/Sim.cpp +++ b/Stars45/Sim.cpp @@ -103,16 +103,16 @@ public: class SimSplash
{
public:
- SimSplash(SimRegion* r, const Point& l, double d, double n)
- : rgn(r), loc(l), damage(d), range(n),
- owner_name("Collateral Damage"), missile(false) { }
-
- SimRegion* rgn;
- Point loc;
- double damage;
- double range;
- Text owner_name;
- bool missile;
+ SimSplash(SimRegion* r, const Point& l, double d, double n)
+ : rgn(r), loc(l), damage(d), range(n),
+ owner_name("Collateral Damage"), missile(false) { }
+
+ Text owner_name;
+ Point loc;
+ double damage;
+ double range;
+ SimRegion* rgn;
+ bool missile;
};
// +--------------------------------------------------------------------+
|