diff options
Diffstat (limited to 'Stars45/Sensor.cpp')
| -rw-r--r-- | Stars45/Sensor.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Stars45/Sensor.cpp b/Stars45/Sensor.cpp index 3a0f15e..e5a4932 100644 --- a/Stars45/Sensor.cpp +++ b/Stars45/Sensor.cpp @@ -11,7 +11,6 @@ Integrated (Passive and Active) Sensor Package class implementation */ -#include "MemDebug.h" #include "Sensor.h" #include "Contact.h" #include "Element.h" @@ -207,7 +206,7 @@ Sensor::ExecFrame(double seconds) Contact* c = FindContact(c_ship); if (!c) { - c = new(__FILE__,__LINE__) Contact(c_ship, 0.0f, 0.0f); + c = new Contact(c_ship, 0.0f, 0.0f); contacts.append(c); } @@ -267,7 +266,7 @@ Sensor::ExecFrame(double seconds) if (c_ship) { if (!t) { - Contact* track = new(__FILE__,__LINE__) Contact(c_ship, contact->d_pas, contact->d_act); + Contact* track = new Contact(c_ship, contact->d_pas, contact->d_act); track->loc = c_ship->Location(); track_list.append(track); } @@ -281,7 +280,7 @@ Sensor::ExecFrame(double seconds) else if (c_shot) { if (!t) { - Contact* track = new(__FILE__,__LINE__) Contact(c_shot, contact->d_pas, contact->d_act); + Contact* track = new Contact(c_shot, contact->d_pas, contact->d_act); track->loc = c_shot->Location(); track_list.append(track); } @@ -435,7 +434,7 @@ Sensor::ProcessContact(Ship* c_ship, double az1, double az2) Contact* c = FindContact(c_ship); if (!c) { - c = new(__FILE__,__LINE__) Contact(c_ship, 0.0f, 0.0f); + c = new Contact(c_ship, 0.0f, 0.0f); contacts.append(c); } @@ -515,7 +514,7 @@ Sensor::ProcessContact(Shot* c_shot, double az1, double az2) Contact* c = FindContact(c_shot); if (!c) { - c = new(__FILE__,__LINE__) Contact(c_shot, 0.0f, 0.0f); + c = new Contact(c_shot, 0.0f, 0.0f); contacts.append(c); } @@ -642,7 +641,7 @@ Sensor::LockTarget(int type, bool closest, bool hostile) if (hostile && (contact->GetIFF(ship) == 0 || contact->GetIFF(ship) == ship->GetIFF())) continue; - targets.append(new(__FILE__,__LINE__) TargetOffset(test, tgt_range)); + targets.append(new TargetOffset(test, tgt_range)); } // clip: @@ -654,7 +653,7 @@ Sensor::LockTarget(int type, bool closest, bool hostile) el = fabs(el / PI); if (az <= 0.2 && el <= 0.2) - targets.append(new(__FILE__,__LINE__) TargetOffset(test, az+el)); + targets.append(new TargetOffset(test, az+el)); } } |