fly/flightgear
1
0
Fork 0
Code Activity

MSVC fixes.

Browse source
This commit is contained in:
curt 2001-03-21 23:10:15 +00:00
parent 2794c003e1
commit cdd3082998
6 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GUI/mouse.cxx
View file

@ -247,7 +247,7 @@ void BusyCursor( int restore )
// Center the view offsets
void CenterView( void ) {
if( mouse_mode = MOUSE_VIEW ) {
if( mouse_mode == MOUSE_VIEW ) {
mouse_mode = MOUSE_POINTER;
_savedX = fgGetInt("/sim/startup/xsize")/2;
_savedY = fgGetInt("/sim/startup/ysize")/2;

2
src/GUI/net_dlg.hxx
View file

@ -22,8 +22,6 @@
//#ifdef FG_NETWORK_OLK
#include <plib/pu.h>
//#include <NetworkOLK/network.h>
//#include <Network/network.h>
extern void NetIdDialog_Cancel(puObject *);
extern void NewCallSign(puObject *cb);

8
src/GUI/sgVec3Slider.cxx
View file

@ -133,10 +133,10 @@ class sgVec3Slider : public puDialogBox
};
sgVec3Slider::sgVec3Slider ( int x, int y, sgVec3 vec, const char *title,
const char *Xtitle = "X",
const char *Ytitle = "Y",
const char *Ztitle = "Z" )
: puDialogBox ( x, y )
const char *Xtitle,
const char *Ytitle,
const char *Ztitle )
: puDialogBox ( x, y )
{
int DialogX = x;
int DialogY = y;

10
src/Scenery/tilemgr.cxx
View file

@ -236,9 +236,11 @@ void FGTileMgr::schedule_needed() {
b = sgBucketOffset( longitude, latitude, 0, 0 );
sched_tile( b );
int x, y;
// schedule next ring of 8 tiles
for ( int x = -1; x <= 1; ++x ) {
for ( int y = -1; y <= 1; ++y ) {
for ( x = -1; x <= 1; ++x ) {
for ( y = -1; y <= 1; ++y ) {
if ( x != 0 || y != 0 ) {
b = sgBucketOffset( longitude, latitude, x, y );
if ( ! global_tile_cache.exists( b ) ) {
@ -249,8 +251,8 @@ void FGTileMgr::schedule_needed() {
}
// schedule remaining tiles
for ( int x = -xrange; x <= xrange; ++x ) {
for ( int y = -yrange; y <= yrange; ++y ) {
for ( x = -xrange; x <= xrange; ++x ) {
for ( y = -yrange; y <= yrange; ++y ) {
if ( x < -1 || x > 1 || y < -1 || y > 1 ) {
SGBucket b = sgBucketOffset( longitude, latitude, x, y );
if ( ! global_tile_cache.exists( b ) ) {

56
src/Sound/morse.cxx
View file

@ -21,6 +21,8 @@
// $Id$
#include <simgear/constants.h>
#include "morse.hxx"
@ -69,8 +71,8 @@ bool FGMorse::init() {
// Make Low DIT
for ( i = 0; i < TRANSITION_BYTES; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
/ (8000.0 / LO_FREQUENCY) ) )
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / LO_FREQUENCY) ) )
* ((double)i / TRANSITION_BYTES)
/ 2.0 + 0.5;
@ -80,7 +82,7 @@ bool FGMorse::init() {
for ( i = TRANSITION_BYTES;
i < DIT_SIZE - TRANSITION_BYTES - COUNT_SIZE; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / LO_FREQUENCY) ) )
/ 2.0 + 0.5;
@ -91,7 +93,7 @@ bool FGMorse::init() {
for ( i = DIT_SIZE - TRANSITION_BYTES - COUNT_SIZE;
i < DIT_SIZE - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / LO_FREQUENCY) ) )
* ((double)j / TRANSITION_BYTES) / 2.0 + 0.5;
--j;
@ -105,7 +107,7 @@ bool FGMorse::init() {
// Make High DIT
for ( i = 0; i < TRANSITION_BYTES; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / HI_FREQUENCY)) )
* ((double)i / TRANSITION_BYTES) / 2.0 + 0.5;
@ -115,7 +117,7 @@ bool FGMorse::init() {
for ( i = TRANSITION_BYTES;
i < DIT_SIZE - TRANSITION_BYTES - COUNT_SIZE; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / HI_FREQUENCY) ) )
/ 2.0 + 0.5;
@ -126,7 +128,7 @@ bool FGMorse::init() {
for ( i = DIT_SIZE - TRANSITION_BYTES - COUNT_SIZE;
i < DIT_SIZE - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / HI_FREQUENCY) ) )
* ((double)j / TRANSITION_BYTES) / 2.0 + 0.5;
--j;
@ -140,7 +142,7 @@ bool FGMorse::init() {
// Make Low DAH
for ( i = 0; i < TRANSITION_BYTES; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / LO_FREQUENCY) ) )
* ((double)i / TRANSITION_BYTES) / 2.0 + 0.5;
@ -151,7 +153,7 @@ bool FGMorse::init() {
for ( i = TRANSITION_BYTES;
i < DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / LO_FREQUENCY) ) )
/ 2.0 + 0.5;
@ -159,10 +161,10 @@ bool FGMorse::init() {
lo_dah[ i ] = (unsigned char) ( level * 255.0 ) ;
}
j = TRANSITION_BYTES;
for ( int i = DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
for ( i = DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
i < DAH_SIZE - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / LO_FREQUENCY) ) )
* ((double)j / TRANSITION_BYTES) / 2.0 + 0.5;
--j;
@ -170,13 +172,13 @@ bool FGMorse::init() {
/* Convert to unsigned byte */
lo_dah[ i ] = (unsigned char) ( level * 255.0 ) ;
}
for ( int i = DAH_SIZE - COUNT_SIZE; i < DAH_SIZE; ++i ) {
for ( i = DAH_SIZE - COUNT_SIZE; i < DAH_SIZE; ++i ) {
lo_dah[ i ] = (unsigned char) ( 0.5 * 255.0 ) ;
}
// Make High DAH
for ( i = 0; i < TRANSITION_BYTES; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / HI_FREQUENCY) ) )
* ((double)i / TRANSITION_BYTES) / 2.0 + 0.5;
@ -187,7 +189,7 @@ bool FGMorse::init() {
for ( i = TRANSITION_BYTES;
i < DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / HI_FREQUENCY) ) )
/ 2.0 + 0.5;
@ -195,10 +197,10 @@ bool FGMorse::init() {
hi_dah[ i ] = (unsigned char) ( level * 255.0 ) ;
}
j = TRANSITION_BYTES;
for ( int i = DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
for ( i = DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
i < DAH_SIZE - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI
float level = ( sin( (double) i * 2.0 * FG_PI
/ (8000.0 / HI_FREQUENCY) ) )
* ((double)j / TRANSITION_BYTES) / 2.0 + 0.5;
--j;
@ -206,12 +208,12 @@ bool FGMorse::init() {
/* Convert to unsigned byte */
hi_dah[ i ] = (unsigned char) ( level * 255.0 ) ;
}
for ( int i = DAH_SIZE - COUNT_SIZE; i < DAH_SIZE; ++i ) {
for ( i = DAH_SIZE - COUNT_SIZE; i < DAH_SIZE; ++i ) {
hi_dah[ i ] = (unsigned char) ( 0.5 * 255.0 ) ;
}
// Make SPACE
for ( int i = 0; i < SPACE_SIZE; ++i ) {
for ( i = 0; i < SPACE_SIZE; ++i ) {
space[ i ] = (unsigned char) ( 0.5 * 255 ) ;
}
@ -225,7 +227,7 @@ bool FGMorse::cust_init(const int freq ) {
// Make DIT
for ( i = 0; i < TRANSITION_BYTES; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI / (8000.0 / freq)) )
float level = ( sin( (double) i * 2.0 * FG_PI / (8000.0 / freq)) )
* ((double)i / TRANSITION_BYTES) / 2.0 + 0.5;
/* Convert to unsigned byte */
@ -234,7 +236,7 @@ bool FGMorse::cust_init(const int freq ) {
for ( i = TRANSITION_BYTES;
i < DIT_SIZE - TRANSITION_BYTES - COUNT_SIZE; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI / (8000.0 / freq) ) )
float level = ( sin( (double) i * 2.0 * FG_PI / (8000.0 / freq) ) )
/ 2.0 + 0.5;
/* Convert to unsigned byte */
@ -244,7 +246,7 @@ bool FGMorse::cust_init(const int freq ) {
for ( i = DIT_SIZE - TRANSITION_BYTES - COUNT_SIZE;
i < DIT_SIZE - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI / (8000.0 / freq) ) )
float level = ( sin( (double) i * 2.0 * FG_PI / (8000.0 / freq) ) )
* ((double)j / TRANSITION_BYTES) / 2.0 + 0.5;
--j;
@ -257,7 +259,7 @@ bool FGMorse::cust_init(const int freq ) {
// Make DAH
for ( i = 0; i < TRANSITION_BYTES; ++i ) {
float level = ( sin( (double) i * 2.0 * M_PI / (8000.0 / freq) ) )
float level = ( sin( (double) i * 2.0 * FG_PI / (8000.0 / freq) ) )
* ((double)i / TRANSITION_BYTES) / 2.0 + 0.5;
/* Convert to unsigned byte */
@ -267,29 +269,29 @@ bool FGMorse::cust_init(const int freq ) {
for ( i = TRANSITION_BYTES;
i < DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI / (8000.0 / freq) ) )
float level = ( sin( (double) i * 2.0 * FG_PI / (8000.0 / freq) ) )
/ 2.0 + 0.5;
/* Convert to unsigned byte */
cust_dah[ i ] = (unsigned char) ( level * 255.0 ) ;
}
j = TRANSITION_BYTES;
for ( int i = DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
for ( i = DAH_SIZE - TRANSITION_BYTES - COUNT_SIZE;
i < DAH_SIZE - COUNT_SIZE;
++i ) {
float level = ( sin( (double) i * 2.0 * M_PI / (8000.0 / freq) ) )
float level = ( sin( (double) i * 2.0 * FG_PI / (8000.0 / freq) ) )
* ((double)j / TRANSITION_BYTES) / 2.0 + 0.5;
--j;
/* Convert to unsigned byte */
cust_dah[ i ] = (unsigned char) ( level * 255.0 ) ;
}
for ( int i = DAH_SIZE - COUNT_SIZE; i < DAH_SIZE; ++i ) {
for ( i = DAH_SIZE - COUNT_SIZE; i < DAH_SIZE; ++i ) {
cust_dah[ i ] = (unsigned char) ( 0.5 * 255.0 ) ;
}
// Make SPACE
for ( int i = 0; i < SPACE_SIZE; ++i ) {
for ( i = 0; i < SPACE_SIZE; ++i ) {
space[ i ] = (unsigned char) ( 0.5 * 255 ) ;
}

2
src/Sound/soundmgr.cxx
View file

@ -224,7 +224,7 @@ bool FGSoundMgr::play_looped( const string& refname ) {
// tell the scheduler to play the indexed sample once
bool FGSoundMgr::FGSoundMgr::play_once( const string& refname ) {
bool FGSoundMgr::play_once( const string& refname ) {
sound_map_iterator it = sounds.find( refname );
if ( it != sounds.end() ) {
FGSimpleSound *sample = it->second;