diff options
Diffstat (limited to 'Stars45/FlightDeck.cpp')
| -rw-r--r-- | Stars45/FlightDeck.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Stars45/FlightDeck.cpp b/Stars45/FlightDeck.cpp index df48def..8b2d070 100644 --- a/Stars45/FlightDeck.cpp +++ b/Stars45/FlightDeck.cpp @@ -11,7 +11,6 @@ Everything needed to launch and recover space craft... */ -#include "MemDebug.h" #include "FlightDeck.h" #include "Ship.h" #include "ShipCtrl.h" @@ -206,7 +205,7 @@ num_catsounds(0), num_approach_pts(s.num_approach_pts) { Mount(s); - slots = new(__FILE__,__LINE__) FlightDeckSlot[num_slots]; + slots = new FlightDeckSlot[num_slots]; for (int i = 0; i < num_slots; i++) { slots[i].spot_rel = s.slots[i].spot_rel; slots[i].filter = s.slots[i].filter; @@ -219,7 +218,7 @@ num_catsounds(0), num_approach_pts(s.num_approach_pts) runway_rel[i] = s.runway_rel[i]; if (s.light) { - light = new(__FILE__,__LINE__) Light(*s.light); + light = new Light(*s.light); } } @@ -535,7 +534,7 @@ FlightDeck::LaunchShip(Ship* slot_ship) Point departure = end_point; departure = departure.OtherHand(); - Instruction* launch_point = new(__FILE__,__LINE__) + Instruction* launch_point = new Instruction(carrier->GetRegion(), departure, Instruction::LAUNCH); launch_point->SetSpeed(350); @@ -611,7 +610,7 @@ void FlightDeck::SetLight(double l) { LIGHT_DESTROY(light); - light = new(__FILE__,__LINE__) Light((float) l); + light = new Light((float) l); } void @@ -656,7 +655,7 @@ void FlightDeck::AddSlot(const Point& spot, DWORD filter) { if (!slots) - slots = new(__FILE__,__LINE__) FlightDeckSlot[10]; + slots = new FlightDeckSlot[10]; slots[num_slots].spot_rel = spot; slots[num_slots].filter = filter; @@ -699,7 +698,7 @@ FlightDeck::Orient(const Physical* rep) if (num_hoops < 1) { num_hoops = 4; - hoops = new(__FILE__,__LINE__) Hoop[num_hoops]; + hoops = new Hoop[num_hoops]; } Point hoop_vec = start_point - end_point; @@ -1026,7 +1025,7 @@ FlightDeck::GrantClearance() Ship* dst = recovery_queue[0]->GetShip(); - RadioMessage* clearance = new(__FILE__,__LINE__) RadioMessage(dst, carrier, RadioMessage::CALL_CLEARANCE); + RadioMessage* clearance = new RadioMessage(dst, carrier, RadioMessage::CALL_CLEARANCE); clearance->SetInfo(Text("for final approach to ") + Name()); RadioTraffic::Transmit(clearance); } |