]> git.mxchange.org Git - flightgear.git/commitdiff
Merge branch 'next' into attenuation
authoradrian <adrian@localhost.com>
Tue, 6 Dec 2011 00:15:04 +0000 (02:15 +0200)
committeradrian <adrian@localhost.com>
Tue, 6 Dec 2011 00:15:04 +0000 (02:15 +0200)
Conflicts:
src/Radio/radio.cxx

1  2 
src/Radio/itm.cpp
src/Radio/radio.cxx

Simple merge
index efb5baf53f7319a8494b0c88b2779eb3ff3e1c2e,e5719e0dcbc8b78622e9d3c099001f804213d391..fba50474664de132996cc9db3792307b13bc2b2a
@@@ -362,14 -362,15 +362,16 @@@ double FGRadioTransmission::ITM_calcula
  
        _elevations.push_front(point_distance);
        _elevations.push_front(num_points -1);
 -      
 -    int size = _elevations.size();
 -    double itm_elev[10000];
++
 +      int size = _elevations.size();
 +      double *itm_elev;
 +      itm_elev = new double[size];
        for(int i=0;i<size;i++) {
                itm_elev[i]=_elevations[i];
 -              //cerr << "ITM:: itm_elev: " << _elevations[i] << endl;
 +              
        }
 -
 +      
        if((transmission_type == 3) || (transmission_type == 4)) {
                // the sender and receiver roles are switched
                point_to_point(itm_elev, receiver_height, transmitter_height,