Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
commit4f19c1a995de507044d1b5ada7fb7398cdb32096 (patch)
treee46c13dd84a493177c80af0715f8f9b09c333943 /source/gameengine/GameLogic
parente56f71400060f10f73bed6b5c52fc537e5a0d617 (diff)
spelling cleanup
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r--source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_JoystickSensor.cpp12
-rw-r--r--source/gameengine/GameLogic/SCA_KeyboardSensor.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_PropertyActuator.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_PythonController.cpp2
-rw-r--r--source/gameengine/GameLogic/SCA_RandomNumberGenerator.h2
6 files changed, 11 insertions, 11 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index 15aeef242b7..b22246014bf 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -89,7 +89,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
{
int i;
// The video subsystem is required for joystick input to work. However,
- // when GHOST is running under SDL, video is initialised elsewhere.
+ // when GHOST is running under SDL, video is initialized elsewhere.
// Do this once only.
# ifdef WITH_GHOST_SDL
if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ){
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 3612115f90e..3f74b4cd807 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -109,7 +109,7 @@ bool SCA_JoystickSensor::Evaluate()
bool result = false;
bool reset = m_reset && m_level;
- if(js==NULL) /* no joystick - dont do anything */
+ if(js==NULL) /* no joystick - don't do anything */
return false;
m_reset = false;
@@ -129,7 +129,7 @@ bool SCA_JoystickSensor::Evaluate()
with expect a zero index.
*/
- if (!js->IsTrigAxis() && !reset) /* No events from SDL? - dont bother */
+ if (!js->IsTrigAxis() && !reset) /* No events from SDL? - don't bother */
return false;
js->cSetPrecision(m_precision);
@@ -159,8 +159,8 @@ bool SCA_JoystickSensor::Evaluate()
}
case KX_JOYSENSORMODE_AXIS_SINGLE:
{
- /* Like KX_JOYSENSORMODE_AXIS but dont pair up axis */
- if (!js->IsTrigAxis() && !reset) /* No events from SDL? - dont bother */
+ /* Like KX_JOYSENSORMODE_AXIS but don't pair up axis */
+ if (!js->IsTrigAxis() && !reset) /* No events from SDL? - don't bother */
return false;
/* No need for 'm_bAllEvents' check here since were only checking 1 axis */
@@ -182,7 +182,7 @@ bool SCA_JoystickSensor::Evaluate()
/* what is what!
m_button = the actual button in question
*/
- if (!js->IsTrigButton() && !reset) /* No events from SDL? - dont bother */
+ if (!js->IsTrigButton() && !reset) /* No events from SDL? - don't bother */
return false;
if(( m_bAllEvents && js->aAnyButtonPressIsPositive()) || (!m_bAllEvents && js->aButtonPressIsPositive(m_button))) {
@@ -203,7 +203,7 @@ bool SCA_JoystickSensor::Evaluate()
direction= m_hatf -- max 12
*/
- if (!js->IsTrigHat() && !reset) /* No events from SDL? - dont bother */
+ if (!js->IsTrigHat() && !reset) /* No events from SDL? - don't bother */
return false;
if((m_bAllEvents && js->GetHat(m_hat-1)) || js->aHatIsPositive(m_hat-1, m_hatf)) {
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index 399ea8d80dd..d7f408d0b4a 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -294,7 +294,7 @@ bool SCA_KeyboardSensor::Evaluate()
}
/* Modify the key state based on qual(s)
- * Tested carefully. dont touch unless your really sure.
+ * Tested carefully. don't touch unless your really sure.
* note, this will only change the results if key modifiers are set.
*
* When all modifiers and keys are positive
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
index 5413638391f..69a37ebe88a 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
@@ -83,7 +83,7 @@ bool SCA_PropertyActuator::Update()
if (m_type==KX_ACT_PROP_TOGGLE)
{
- /* dont use */
+ /* don't use */
CValue* newval;
CValue* oldprop = propowner->GetProperty(m_propname);
if (oldprop)
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 11ea7e51858..67c813acdc0 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -353,7 +353,7 @@ bool SCA_PythonController::Import()
return false;
}
- m_function_argc = 0; /* rare cases this could be a function that isnt defined in python, assume zero args */
+ m_function_argc = 0; /* rare cases this could be a function that isn't defined in python, assume zero args */
if (PyFunction_Check(m_function)) {
m_function_argc= ((PyCodeObject *)PyFunction_GET_CODE(m_function))->co_argcount;
}
diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
index a935db94020..4391dcb304b 100644
--- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
+++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
@@ -53,7 +53,7 @@ class SCA_RandomNumberGenerator {
unsigned long mt[624];
/** mti==N+1 means mt[KX_MT_VectorLenght] is not initialized */
- int mti; /* initialised in the cpp file */
+ int mti; /* initialized in the cpp file */
/** Calculate a start vector */
void SetStartVector(void);