diff options
Diffstat (limited to 'Stars45/Instruction.cpp')
| -rw-r--r-- | Stars45/Instruction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Stars45/Instruction.cpp b/Stars45/Instruction.cpp index a14b950..4ee3a9c 100644 --- a/Stars45/Instruction.cpp +++ b/Stars45/Instruction.cpp @@ -58,7 +58,7 @@ Instruction::Instruction(const char* rgn, Point loc, int act) : region(0), action(act), formation(0), status(PENDING), speed(0), target(0), emcon(0), wep_free(0), priority(PRIMARY), farcast(0), hold_time(0) -{ +{ rgn_name = rgn; rloc.SetBaseLocation(loc); rloc.SetDistance(0); @@ -68,7 +68,7 @@ Instruction::Instruction(SimRegion* rgn, Point loc, int act) : region(rgn), action(act), formation(0), status(PENDING), speed(0), target(0), emcon(0), wep_free(0), priority(PRIMARY), farcast(0), hold_time(0) -{ +{ rgn_name = region->Name(); rloc.SetBaseLocation(loc); rloc.SetDistance(0); @@ -248,7 +248,7 @@ Instruction::Evaluate(Ship* ship) if (e->IsFinished() || e->IsSquadron()) continue; - if (e->Name() == tgt_name || + if (e->Name() == tgt_name || (e->GetCommander() && e->GetCommander()->Name() == tgt_name)) { found = true; |