fly/flightgear
1
0
Fork 0
Code Activity

Cygwin fixes contributed by Norman Vine.

Browse source
This commit is contained in:
curt 2001-06-12 23:15:16 +00:00
parent da33ab1cf8
commit 3d0ed99651
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Input/fgjs.cxx
View file

@ -26,7 +26,6 @@
#include STL_FSTREAM #include STL_FSTREAM
#include STL_STRING #include STL_STRING
#include <jssuper.h>
#include <jsinput.h> #include <jsinput.h>
SG_USING_STD(string); SG_USING_STD(string);
@ -119,7 +118,7 @@ int main(void) {
jsSuper *jss=new jsSuper(); jsSuper *jss=new jsSuper();
jsInput *jsi=new jsInput(jss); jsInput *jsi=new jsInput(jss);
jsi->displayValues(false); jsi->displayValues(false);
int i; // int i;
int control=0; int control=0;

8
src/Input/jsinput.cxx
View file

@ -18,11 +18,7 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <jssuper.h>
#include <jsinput.h> #include <jsinput.h>
#include <plib/js.h>
#include <plib/ul.h>
jsInput::jsInput(jsSuper *j) { jsInput::jsInput(jsSuper *j) {
jss=j; jss=j;
@ -38,7 +34,7 @@ int jsInput::getInput(void){
bool gotit=false; bool gotit=false;
float delta; float delta;
int i,current_button=0,button_bits; int i, current_button = 0, button_bits = 0;
joystick=axis=button=-1; joystick=axis=button=-1;
@ -113,5 +109,7 @@ int jsInput::getInput(void){
} }
} }
} }
return 0;
} }

1
src/Input/jsinput.h
View file

@ -24,7 +24,6 @@
#define _JSINPUT_H #define _JSINPUT_H
#include <jssuper.h> #include <jssuper.h>
#include <plib/js.h>
class jsInput { class jsInput {
private: private:

7
src/Input/jssuper.cxx
View file

@ -19,9 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <string.h> // plib/js.h should really include this !!!!!!
#include <plib/js.h>
#include <jssuper.h> #include <jssuper.h>
@ -51,7 +48,7 @@ jsSuper::jsSuper(void) {
int jsSuper::nextJoystick(void) { int jsSuper::nextJoystick(void) {
int i; // int i;
if(!activeJoysticks) return 0; if(!activeJoysticks) return 0;
if(currentJoystick == last ) return 0; if(currentJoystick == last ) return 0;
currentJoystick++; currentJoystick++;
@ -60,7 +57,7 @@ int jsSuper::nextJoystick(void) {
} }
int jsSuper::prevJoystick(void) { int jsSuper::prevJoystick(void) {
int i; // int i;
if(!activeJoysticks) return 0; if(!activeJoysticks) return 0;
if(currentJoystick == first ) return 0; if(currentJoystick == first ) return 0;
currentJoystick--; currentJoystick--;

3
src/Input/jssuper.h
View file

@ -21,6 +21,9 @@
#ifndef _JSSUPER_H #ifndef _JSSUPER_H
#define _JSSUPER_H #define _JSSUPER_H
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_WINDOWS_H #ifdef HAVE_WINDOWS_H
# include <windows.h> # include <windows.h>