Changeset 731 for abuse/trunk/srcTweet

Timestamp:

Jul 21, 2014, 12:50:29 AM (8 years ago)

Author:

jjsimpso

Message:

sdlport: Add support for SDL2, inculding the game controller API. Configure
script will check for SDL2 and use it if present, otherwise it will fall
back to SDL v1. Some old SDL v1 features not implemented yet on SDL2, such
as saving screenshots.

core: Small change for SDL2 game controller API to disable the game
controller in the save/load game menu.

Summary of game controller API changes:

• Enable with -gamepad
• Tested with PS3 dualshock 3.
• D-pad moves, right analog controls aiming
• X: change weapon, []: jump, R1: fire, L1: special ability, /\:use/activate
• All menu navigation requires the mouse, which is disabled during normal game play.

Location:

abuse/trunk/src

Files:

• Makefile.am (modified) (3 diffs)
• imlib/event.h (modified) (2 diffs)
• loadgame.cpp (modified) (2 diffs)
• sdl2port (added)
• sdl2port/Makefile.am (added)
• sdl2port/event.cpp (added)
• sdl2port/hmi.cpp (added)
• sdl2port/hmi.h (added)
• sdl2port/jdir.cpp (added)
• sdl2port/joy.h (added)
• sdl2port/joystick.cpp (added)
• sdl2port/mouse.cpp (added)
• sdl2port/setup.cpp (added)
• sdl2port/setup.h (added)
• sdl2port/sound.cpp (added)
• sdl2port/sound.h (added)
• sdl2port/timing.cpp (added)
• sdl2port/video.cpp (added)

abuse/trunk/src/Makefile.am

@@ -1 +1 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = lisp net imlib sdlport
+SUBDIRS = lisp net imlib @SDLPORT_DIR@
 
 bin_PROGRAMS = abuse abuse-tool
@@ -65 +65 @@
     $(NULL)
 
-EXTRALIBS = lisp/liblisp.a sdlport/libsdlport.a imlib/libimlib.a net/libnet.a
+EXTRALIBS = lisp/liblisp.a @SDLPORT_DIR@/libsdlport.a imlib/libimlib.a net/libnet.a
 abuse_LDADD = $(EXTRALIBS)
 abuse_DEPENDENCIES = $(EXTRALIBS)
@@ -75 +75 @@
 abuse_tool_DEPENDENCIES = $(abuse_tool_LDADD)
 
-INCLUDES = -I$(srcdir) -I$(srcdir)/lisp -I$(srcdir)/imlib \
+INCLUDES = -I$(srcdir) -I $(srcdir)/lisp -I$(srcdir)/imlib \
            -I$(srcdir)/net $(SDL_CFLAGS)
 
 CPPFLAGS = @CPPFLAGS@ -DNO_CHECK
-

abuse/trunk/src/imlib/event.h

@@ -90 +90 @@
     }
 
+  // To enable/disable game controller
+  // enables switching between mouse and gamepad when entering certain screens
+  // Added for SDL2 game controller support
+  void enable_controller(bool enabled)
+  {
+      controller_enabled = enabled;
+  }
+
 private:
     linked_list m_events;
@@ -95 +103 @@
 
     image *m_screen;
+    bool controller_enabled;
 
 protected:

abuse/trunk/src/loadgame.cpp

@@ -243 +243 @@
     do
     {
+        // disable game controller during save/load screen so that mouse can be used
+        wm->enable_controller(false);
+        
         wm->flush_screen();
         wm->get_event(ev);
@@ -259 +262 @@
     } while (!got_level && !quit);
 
+    wm->enable_controller(true);
+
     wm->close_window(l_win);
     wm->close_window(preview);