From f2a679ae06fb9ac544a6ed3a33ea1767d1da9797 Mon Sep 17 00:00:00 2001 From: elias Date: Tue, 27 Nov 2007 09:14:51 +0000 Subject: [PATCH] Made DirectAndRawInput the default windows plugin. Teach jinput about vista. --- .../net/java/games/input/DefaultControllerEnvironment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java index 3ce9b3f..e2e890b 100644 --- a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java +++ b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java @@ -133,7 +133,7 @@ class DefaultControllerEnvironment extends ControllerEnvironment { pluginClasses = pluginClasses + " net.java.games.input.LinuxEnvironmentPlugin"; } else if(osName.equals("Mac OS X")) { pluginClasses = pluginClasses + " net.java.games.input.OSXEnvironmentPlugin"; - } else if(osName.equals("Windows XP")) { + } else if(osName.equals("Windows XP") || osName.equals("Windows Vista")) { pluginClasses = pluginClasses + " net.java.games.input.DirectAndRawInputEnvironmentPlugin"; } else if(osName.equals("Windows 98") || osName.equals("Windows 2000")) { pluginClasses = pluginClasses + " net.java.games.input.DirectInputEnvironmentPlugin"; @@ -141,7 +141,7 @@ class DefaultControllerEnvironment extends ControllerEnvironment { System.out.println("WARNING: Found unknown Windows version: " + osName); System.out.println("Attempting to use default windows plug-in."); System.out.flush(); - pluginClasses = pluginClasses + " net.java.games.input.DirectInputEnvironmentPlugin"; + pluginClasses = pluginClasses + " net.java.games.input.DirectAndRawInputEnvironmentPlugin"; } else { System.out.println("Trying to use default plugin, OS name " + osName +" not recognised"); }