Merge revision 12 of oddlabs svn repo.

Mac OS X: build.xml fix
Windows: Fixed crash when Raw plugin fails to load
Mac OS X: Tweak native libraries so only one library, libjinput-osx.jnilib contains both gcc 3 ppc code and gcc 4 i386 code. That way, we'll cover all releases and architectures with one native library instead of two
This commit is contained in:
endolf 2006-05-14 09:14:52 +00:00
parent 559c008a02
commit 1dc8f9ea11
3 changed files with 26 additions and 20 deletions

View file

@ -102,6 +102,8 @@ public final class DirectInputEnvironmentPlugin extends ControllerEnvironment im
for (int i = 0; i < device_objects.size(); i++) {
DIDeviceObject device_object = (DIDeviceObject)device_objects.get(i);
Component.Identifier identifier = device_object.getIdentifier();
if (identifier == null)
continue;
if (map_mouse_buttons && identifier instanceof Component.Identifier.Button) {
identifier = DIIdentifierMap.mapMouseButtonIdentifier((Component.Identifier.Button)identifier);
}