Revision: 2596
          http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2596&view=rev
Author:   ulteq
Date:     2012-05-19 13:17:12 +0000 (Sat, 19 May 2012)
Log Message:
-----------
Bugfix: merged theshark's patch, fixes blinker reset behavior

Modified Paths:
--------------
    trunk/source/main/physics/Beam.cpp

Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp  2012-05-19 02:05:24 UTC (rev 2595)
+++ trunk/source/main/physics/Beam.cpp  2012-05-19 13:17:12 UTC (rev 2596)
@@ -3897,28 +3897,26 @@
 
 void Beam::setBlinkType(blinktype blink)
 {
-#ifdef USE_OPENAL
        blinkingtype = blink;
-       if(blinkingtype == BLINK_NONE)
+
+       left_blink_on = false;
+       right_blink_on = false;
+       warn_blink_on = false;
+
+#ifdef USE_OPENAL
+       if (blink == BLINK_NONE)
        {
-               left_blink_on = false;
-               right_blink_on = false;
-               warn_blink_on = false;
-       }
-       if(blink == BLINK_NONE)
-       {
                SoundScriptManager::getSingleton().trigStop(trucknum, 
SS_TRIG_TURN_SIGNAL);
        } else
        {
                SoundScriptManager::getSingleton().trigStart(trucknum, 
SS_TRIG_TURN_SIGNAL);
        }
-
 #endif //OPENAL
 }
 
 void Beam::autoBlinkReset()
 {
-       blinktype blink=getBlinkType();
+       blinktype blink = getBlinkType();
 
        // TODO: make this set-able per truck
        float blink_lock_range = 0.1f;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel

Reply via email to