From 03005e608b31a174f5c485421aa9484bb79670bd Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 18 Oct 1998 01:51:04 +0000 Subject: [PATCH] c++-ifying ... --- Controls/{controls.c => controls.cxx} | 117 +++++++++++++------------- Controls/{controls.h => controls.hxx} | 21 +++-- 2 files changed, 69 insertions(+), 69 deletions(-) rename Controls/{controls.c => controls.cxx} (62%) rename Controls/{controls.h => controls.hxx} (91%) diff --git a/Controls/controls.c b/Controls/controls.cxx similarity index 62% rename from Controls/controls.c rename to Controls/controls.cxx index 386b5a58a..058d76eb8 100644 --- a/Controls/controls.c +++ b/Controls/controls.cxx @@ -1,31 +1,29 @@ -/************************************************************************** - * controls.c -- defines a standard interface to all flight sim controls - * - * Written by Curtis Olson, started May 1997. - * - * Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ - * (Log is kept at end of this file) - **************************************************************************/ - - -#include -#include +// controls.cxx -- defines a standard interface to all flight sim controls +// +// Written by Curtis Olson, started May 1997. +// +// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// +// $Id$ +// (Log is kept at end of this file) + + +#include +#include fgCONTROLS cur_control_params; @@ -186,33 +184,36 @@ void fgBrakeSet( double brake_amt ) { } -/* $Log$ -/* Revision 1.8 1998/09/29 02:01:31 curt -/* Added a brake. -/* - * Revision 1.7 1998/02/07 15:29:36 curt - * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss - * - * - * Revision 1.6 1998/01/19 19:27:02 curt - * Merged in make system changes from Bob Kuehne - * This should simplify things tremendously. - * - * Revision 1.5 1998/01/19 18:40:22 curt - * Tons of little changes to clean up the code and to remove fatal errors - * when building with the c++ compiler. - * - * Revision 1.4 1997/12/10 22:37:41 curt - * Prepended "fg" on the name of all global structures that didn't have it yet. - * i.e. "struct WEATHER {}" became "struct fgWEATHER {}" - * - * Revision 1.3 1997/08/27 03:30:01 curt - * Changed naming scheme of basic shared structures. - * - * Revision 1.2 1997/06/21 17:12:48 curt - * Capitalized subdirectory names. - * - * Revision 1.1 1997/05/31 19:24:04 curt - * Initial revision. - * - */ +// $Log$ +// Revision 1.1 1998/10/18 01:51:05 curt +// c++-ifying ... +// +// Revision 1.8 1998/09/29 02:01:31 curt +// Added a brake. +// +// Revision 1.7 1998/02/07 15:29:36 curt +// Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss +// +// +// Revision 1.6 1998/01/19 19:27:02 curt +// Merged in make system changes from Bob Kuehne +// This should simplify things tremendously. +// +// Revision 1.5 1998/01/19 18:40:22 curt +// Tons of little changes to clean up the code and to remove fatal errors +// when building with the c++ compiler. +// +// Revision 1.4 1997/12/10 22:37:41 curt +// Prepended "fg" on the name of all global structures that didn't have it yet. +// i.e. "struct WEATHER {}" became "struct fgWEATHER {}" +// +// Revision 1.3 1997/08/27 03:30:01 curt +// Changed naming scheme of basic shared structures. +// +// Revision 1.2 1997/06/21 17:12:48 curt +// Capitalized subdirectory names. +// +// Revision 1.1 1997/05/31 19:24:04 curt +// Initial revision. +// + diff --git a/Controls/controls.h b/Controls/controls.hxx similarity index 91% rename from Controls/controls.h rename to Controls/controls.hxx index 2b6bf58f6..79550732e 100644 --- a/Controls/controls.h +++ b/Controls/controls.hxx @@ -1,4 +1,4 @@ -// controls.h -- defines a standard interface to all flight sim controls +// controls.hxx -- defines a standard interface to all flight sim controls // // Written by Curtis Olson, started May 1997. // @@ -22,19 +22,19 @@ // (Log is kept at end of this file) -#ifndef _CONTROLS_H -#define _CONTROLS_H +#ifndef _CONTROLS_HXX +#define _CONTROLS_HXX #include -#ifdef __cplusplus -extern "C" { +#ifndef __cplusplus +# error This library requires C++ #endif -/* Define a structure containing the control parameters */ +// Define a structure containing the control parameters typedef struct { double aileron; @@ -84,15 +84,14 @@ void fgThrottleSet(int engine, double pos); void fgBrakeSet( double brake_amt ); double fgBrakeGet( void ); -#ifdef __cplusplus -} -#endif - -#endif /* _CONTROLS_H */ +#endif // _CONTROLS_HXX // $Log$ +// Revision 1.1 1998/10/18 01:51:07 curt +// c++-ifying ... +// // Revision 1.17 1998/09/29 14:57:00 curt // c++-ified some comments. // -- 2.39.2