Merge branch 'master' into ps2menu

5 files changed, 26 insertions, 26 deletions

diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index fc23e900..3ef0ab63 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -274,7 +274,7 @@ psNativeTextureSupport(void)
  *****************************************************************************
  */
 RwBool
-psInitialise(void)
+psInitialize(void)
 {
 	PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
 
@@ -789,7 +789,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
 	
 	useDefault = TRUE;
 	
-	if ( RsEventHandler(rsRWINITIALISE, &openParams) == rsEVENTERROR )
+	if ( RsEventHandler(rsRWINITIALIZE, &openParams) == rsEVENTERROR )
 		return FALSE;
 
 	RwInitialised = TRUE;
@@ -1312,7 +1312,7 @@ main(int argc, char *argv[])
 	 * Initialize the platform independent data.
 	 * This will in turn initialize the platform specific data...
 	 */
-	if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR )
+	if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
 	{
 		return FALSE;
 	}
@@ -1355,7 +1355,7 @@ main(int argc, char *argv[])
 	/* 
 	 * Initialize the 3D (RenderWare) components of the app...
 	 */
-	if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, &openParams) )
+	if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, &openParams) )
 	{
 		RsEventHandler(rsTERMINATE, nil);
 
@@ -1747,7 +1747,7 @@ void CapturePad(RwInt32 padID)
 
 void joysChangeCB(int jid, int event)
 {
-	if (event == GLFW_CONNECTED)
+	if (event == GLFW_CONNECTED && !IsThisJoystickBlacklisted(jid))
 	{
 		if (PSGLOBAL(joy1id) == -1)
 			PSGLOBAL(joy1id) = jid;
diff --git a/src/skel/platform.h b/src/skel/platform.h
index 65e20673..cbb1be28 100644
--- a/src/skel/platform.h
+++ b/src/skel/platform.h
@@ -15,7 +15,7 @@ extern RwUInt32 psTimer(void);
 extern double psTimer(void);
 #endif
 
-extern RwBool psInitialise(void);
+extern RwBool psInitialize(void);
 extern void   psTerminate(void);
 
 extern void psCameraShowRaster(RwCamera *camera);
diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp
index 5191eda7..8191107e 100644
--- a/src/skel/skeleton.cpp
+++ b/src/skel/skeleton.cpp
@@ -246,8 +246,8 @@ RsEventHandler(RsEvent event, void *param)
 				result = (rsEVENTPROCESSED);
 				break;
 
-			case rsRWINITIALISE:
-				result = (RsRwInitialise(param) ?
+			case rsRWINITIALIZE:
+				result = (RsRwInitialize(param) ?
 						  rsEVENTPROCESSED : rsEVENTERROR);
 				break;
 
@@ -256,9 +256,9 @@ RsEventHandler(RsEvent event, void *param)
 				result = (rsEVENTPROCESSED);
 				break;
 
-			case rsINITIALISE:
+			case rsINITIALIZE:
 				result =
-					(RsInitialise()? rsEVENTPROCESSED : rsEVENTERROR);
+					(RsInitialize()? rsEVENTPROCESSED : rsEVENTERROR);
 				break;
 
 			default:
@@ -294,7 +294,7 @@ RsRwTerminate(void)
  *****************************************************************************
  */
 RwBool
-RsRwInitialise(void *displayID)
+RsRwInitialize(void *displayID)
 {
 	RwEngineOpenParams  openParams;
 
@@ -383,7 +383,7 @@ RsTerminate(void)
  *****************************************************************************
  */
 RwBool
-RsInitialise(void)
+RsInitialize(void)
 {
 	/*
 	 * Initialize Platform independent data...
@@ -415,7 +415,7 @@ RsInitialise(void)
 	RsGlobal.pad.inputEventHandler = nil;
 	RsGlobal.pad.used = FALSE;
 
-	result = psInitialise();
+	result = psInitialize();
 
 	return result;
 }
diff --git a/src/skel/skeleton.h b/src/skel/skeleton.h
index 8303bd9a..b5ea5abf 100644
--- a/src/skel/skeleton.h
+++ b/src/skel/skeleton.h
@@ -61,10 +61,10 @@ enum RsEvent
 	_rs_18,
 	_rs_19,
 	_rs_20,
-	rsRWINITIALISE,
+	rsRWINITIALIZE,
 	rsRWTERMINATE,
 	rsSELECTDEVICE,
-	rsINITIALISE,
+	rsINITIALIZE,
 	rsTERMINATE,
 	rsIDLE,
 	rsFRONTENDIDLE,
@@ -241,19 +241,19 @@ extern RsEventStatus RsEventHandler(RsEvent event, void *param);
 extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
 extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
 
-extern RwBool                   
-RsInitialise(void);
+extern RwBool
+RsInitialize(void);
 
-extern RwBool                   
+extern RwBool
 RsRegisterImageLoader(void);
 
-extern RwBool                   
-RsRwInitialise(void *param);
+extern RwBool
+RsRwInitialize(void *param);
 
-extern RwBool                   
+extern RwBool
 RsSelectDevice(void);
 
-extern RwBool                   
+extern RwBool
 RsInputDeviceAttach(RsInputDeviceType inputDevice,
 					RsInputEventHandler inputEventHandler);
 
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 2b083f06..d923d93d 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -586,7 +586,7 @@ void _psPrintCpuInfo()
  *****************************************************************************
  */
 RwBool
-psInitialise(void)
+psInitialize(void)
 {
 	PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
 
@@ -1570,7 +1570,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
 	
 	useDefault = TRUE;
 	
-	if ( RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) == rsEVENTERROR )
+	if ( RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) == rsEVENTERROR )
 		return FALSE;
 	
 	RwInitialised = TRUE;
@@ -1940,7 +1940,7 @@ WinMain(HINSTANCE instance,
 	 * Initialize the platform independent data.
 	 * This will in turn initialize the platform specific data...
 	 */
-	if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR )
+	if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
 	{
 		return FALSE;
 	}
@@ -2006,7 +2006,7 @@ WinMain(HINSTANCE instance,
 	/* 
 	 * Initialize the 3D (RenderWare) components of the app...
 	 */
-	if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) )
+	if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) )
 	{
 		DestroyWindow(PSGLOBAL(window));