java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv26794

Modified Files:
	org_lwjgl_input_Controller.cpp org_lwjgl_input_Mouse.cpp 
Log Message:
removed \n

Index: org_lwjgl_input_Controller.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- org_lwjgl_input_Controller.cpp	12 Jan 2004 17:15:41 -0000	1.19
+++ org_lwjgl_input_Controller.cpp	12 Jan 2004 17:24:47 -0000	1.20
@@ -119,7 +119,7 @@
   
   // assert that window has been created
 	if(hwnd == NULL) {
-    throwException(env, "Please create the window before initializing input devices\n");
+    throwException(env, "Please create the window before initializing input devices");
     return;
 	}
 	

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- org_lwjgl_input_Mouse.cpp	12 Jan 2004 16:28:51 -0000	1.43
+++ org_lwjgl_input_Mouse.cpp	12 Jan 2004 17:24:47 -0000	1.44
@@ -110,7 +110,7 @@
 
   // assert that Direct Input has been created
 	if(lpdi == NULL) {
-    throwException(env, "Please create the window before initializing input devices\n");
+    throwException(env, "Please create the window before initializing input devices");
     return;
 	} 
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv26066

Modified Files:
	Window.h 
Log Message:
make controller work again!

Index: Window.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Window.h	11 Oct 2003 16:29:40 -0000	1.6
+++ Window.h	12 Jan 2004 17:21:56 -0000	1.7
@@ -46,7 +46,7 @@
 	#include <windows.h>

 	#include <jni.h>

 	#undef  DIRECTINPUT_VERSION

-	#define DIRECTINPUT_VERSION 0x0300

+	#define DIRECTINPUT_VERSION 0x0500

 	#include <dinput.h>

 	#include "extgl.h"

 

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv24805

Modified Files:
	org_lwjgl_input_Controller.cpp 
Log Message:
assert that Window has been created

Index: org_lwjgl_input_Controller.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- org_lwjgl_input_Controller.cpp	20 Dec 2003 22:03:25 -0000	1.18
+++ org_lwjgl_input_Controller.cpp	12 Jan 2004 17:15:41 -0000	1.19
@@ -116,6 +116,13 @@
  * Called when the Controller instance is to be created
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Controller_nCreate(JNIEnv *env, jclass clazz) {
+  
+  // assert that window has been created
+	if(hwnd == NULL) {
+    throwException(env, "Please create the window before initializing input devices\n");
+    return;
+	}
+	
 	// Create the DirectInput object. 
 	HRESULT hr;
 	hr = DirectInputCreate(dll_handle, DIRECTINPUT_VERSION, &cDI, NULL); 

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv13728

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
assert that Direct Input has been created

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- org_lwjgl_input_Mouse.cpp	20 Dec 2003 22:03:25 -0000	1.42
+++ org_lwjgl_input_Mouse.cpp	12 Jan 2004 16:28:51 -0000	1.43
@@ -108,6 +108,12 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nCreate(JNIEnv *env, jclass clazz) {
 	HRESULT hr;
 
+  // assert that Direct Input has been created
+	if(lpdi == NULL) {
+    throwException(env, "Please create the window before initializing input devices\n");
+    return;
+	} 
+
 	ShowCursor(FALSE);
 	CacheMouseFields(env, clazz);