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>2013-11-24 08:23:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-11-24 08:23:38 +0400
commit91a24654ddae7359f1b20161ba0a7a37958d91e1 (patch)
treed3d80114143b25f2393b08e53cfd5266450459ad /source/gameengine
parent4c4aeaa5467e7f303aeb0da55731ee2294d6b376 (diff)
Code Cleanup: whitespace / formatting
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp5
-rw-r--r--source/gameengine/Ketsji/KX_SoundActuator.cpp7
2 files changed, 7 insertions, 5 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index 793ce6a7b83..6e379c91d0c 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -293,10 +293,11 @@ void SCA_Joystick::DestroyJoystickDevice(void)
#ifdef WITH_SDL
if (m_isinit) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
- if (SDL_JoystickGetAttached(m_private->m_joystick)) {
+ if (SDL_JoystickGetAttached(m_private->m_joystick))
#else
- if (SDL_JoystickOpened(m_joyindex)) {
+ if (SDL_JoystickOpened(m_joyindex))
#endif
+ {
JOYSTICK_ECHO("Closing-joystick " << m_joyindex);
SDL_JoystickClose(m_private->m_joystick);
}
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index 3a4b1d82946..4e5cd0ac5e1 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -147,7 +147,7 @@ CValue* KX_SoundActuator::GetReplica()
KX_SoundActuator* replica = new KX_SoundActuator(*this);
replica->ProcessReplica();
return replica;
-};
+}
void KX_SoundActuator::ProcessReplica()
{
@@ -217,11 +217,12 @@ bool KX_SoundActuator::Update(double curtime, bool frame)
// m_posevent==false && m_posevent==false, in this case IsNegativeEvent() returns false
// and assumes this is a positive event.
// check that we actually have a positive event so as not to play sounds when being disabled.
- else if (bPositiveEvent) { // <- added since 2.49
+ else if (bPositiveEvent) /* <- added since 2.49 */
#else
- else { // <- works in most cases except a loop-end sound will never stop unless
+ else // <- works in most cases except a loop-end sound will never stop unless
// the negative pulse is done continuesly
#endif
+ {
if (!m_isplaying)
play();
}