From f498d6e01a79ef9509d4b3e39e9ef354d0f7428a Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Sun, 7 Sep 2014 01:53:10 +0200 Subject: use JOYSTICK_{UINPUT,PATCHEDINPUTPLUGIN} #defines instead of FREEBSD/LINUX --- mariokart.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mariokart.cpp') diff --git a/mariokart.cpp b/mariokart.cpp index d0903b2..414a9cd 100644 --- a/mariokart.cpp +++ b/mariokart.cpp @@ -203,7 +203,7 @@ int main(int argc, char* argv[]) string tmp; -#ifdef LINUX +#ifdef JOYSTICK_UINPUT Joystick joystick; cout << "joystick initalized, now starting mupen." << endl; #endif @@ -211,7 +211,7 @@ int main(int argc, char* argv[]) // for mupen 1.x if (fork()==0) { system("mupen64plus --nogui --noask ~/MarioKart64.rom"); exit(0); } if (fork()==0) { system("mupen64plus --windowed --resolution 640x480 ~/konsolenspiele/N64/MarioKart64.rom"); exit(0); } -#ifdef FREEBSD +#ifdef JOYSTICK_PATCHEDINPUTPLUGIN sleep(2); Joystick joystick; #endif @@ -221,7 +221,7 @@ int main(int argc, char* argv[]) joystick.reset(); cout << "successfully reset joystick." << endl; -/* cout << "press enter to steer left" << endl; + cout << "press enter to steer left" << endl; getchar(); @@ -247,7 +247,7 @@ int main(int argc, char* argv[]) cout << "A released." << endl; joystick.press_a(false); - getchar();*/ + getchar(); cout << "waiting for game to start, press enter when started." << endl; joystick.press_a(false); -- cgit v1.2.3