From c844aa265ad4eb50ad0e18661470fa6092052728 Mon Sep 17 00:00:00 2001
From: Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>
Date: Fri, 25 Mar 2005 10:33:39 +0000
Subject: Big patches: Erwin Coumans: Abstract the physics engine Charlie C:
 Joystick fixes Me: Moved the ray cast (shadows, mouse sensor & ray sensor)

---
 source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp       | 12 +++++++++---
 source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'source/gameengine/GameLogic/Joystick')

diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index 7d1d4b28730..02775c58168 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -28,7 +28,7 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 #include <SDL.h>
- 
+
 #include "SCA_Joystick.h"
 #include "SCA_JoystickPrivate.h"
 
@@ -47,11 +47,14 @@ SCA_Joystick::SCA_Joystick()
 	m_private = new PrivateData();
 }
 
+
 SCA_Joystick::~SCA_Joystick()
+
 {
 	delete m_private;
 }
 
+
 bool SCA_Joystick::CreateJoystickDevice()
 {
 	bool init = false;
@@ -66,6 +69,7 @@ void SCA_Joystick::DestroyJoystickDevice()
 		pDestroyJoystickDevice();
 }
 
+
 void SCA_Joystick::HandleEvents()
 {
 	if(m_isinit)
@@ -91,6 +95,7 @@ void SCA_Joystick::cSetPrecision(int val)
 	m_prec = val;
 }
 
+
 bool SCA_Joystick::aRightAxisIsPositive(int axis)
 {
 	bool result;
@@ -164,7 +169,6 @@ int SCA_Joystick::pGetButtonPress(int button)
 	if(button == m_buttonnum)
 		return m_buttonnum;
 	return -2;
-
 }
 
 
@@ -279,6 +283,7 @@ int SCA_Joystick::GetNumberOfButtons()
 	return -1;
 }
 
+
 int SCA_Joystick::GetNumberOfHats()
 {
 	int number;
@@ -291,7 +296,6 @@ int SCA_Joystick::GetNumberOfHats()
 	return -1;
 }
 
-
 bool SCA_Joystick::pCreateJoystickDevice()
 {
 	if(m_isinit == false){
@@ -328,6 +332,7 @@ void SCA_Joystick::pDestroyJoystickDevice()
 	SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO );
 }
 
+
 void SCA_Joystick::pFillAxes()
 {
 	if(GetNumberOfAxes() == 1){
@@ -344,6 +349,7 @@ void SCA_Joystick::pFillAxes()
 	}
 }
 
+
 int SCA_Joystick::pGetAxis(int axisnum, int udlr)
 {
 	if(axisnum == 1 && udlr == 1)return m_axis10; //u/d
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
index 90bb728936b..5fd8510d566 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
@@ -28,10 +28,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 #include <SDL.h>
- 
 #include "SCA_Joystick.h"
 #include "SCA_JoystickPrivate.h"
 
+
+
 void SCA_Joystick::OnAxisMotion(void)
 {
 	pFillAxes();
@@ -70,4 +71,3 @@ void SCA_Joystick::OnNothing(void)
 {
 	m_istrig = 0;
 }
-
-- 
cgit v1.2.3