Revision: 2529
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2529&view=rev
Author: ulteq
Date: 2012-05-09 00:02:48 +0000 (Wed, 09 May 2012)
Log Message:
-----------
-Bugfix: merged theshark's patch for #959 - thanks
Modified Paths:
--------------
trunk/source/main/physics/Beam.cpp
Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp 2012-05-08 10:11:24 UTC (rev 2528)
+++ trunk/source/main/physics/Beam.cpp 2012-05-09 00:02:48 UTC (rev 2529)
@@ -52,6 +52,7 @@
#include "RoRFrameListener.h"
#include "screwprop.h"
#include "Scripting.h"
+#include "Settings.h"
#include "Skidmark.h"
#include "SlideNode.h"
#include "turbojet.h"
@@ -476,13 +477,16 @@
oldreplaypos=-1;
watercontact=0;
watercontactold=0;
- // lastdt=0.1;
- //for (i=0; i<MAX_COMMANDS; i++)
{commandkey[i].bfree=0;commandkey[i].rotfree=0;commandkey[i].kpressed=0;};
+ // initialize commands
+ for (int i=0; i<MAX_COMMANDS; i++)
+ {
+ commandkey[i].commandValueState = -1;
+ commandkey[i].commandValue = 0;
+ }
ipy=py;
position=Vector3(px,py,pz);
lastposition=Vector3(px,py,pz);
lastlastposition=Vector3(px,py,pz);
-// aposition=Vector3(px,py,pz);
cabFadeMode = 0;
cabFadeTimer=0;
@@ -5196,23 +5200,23 @@
bool enabled = (soundsources[i].type == -2 ||
soundsources[i].type == currentcamera);
soundsources[i].ssi->setEnabled(enabled);
}
-#endif //OPENAL
+#endif // USE_OPENAL
- // change videocamera mode needs for-loop through all
video(mirror)cams, check cmode against currentcamera and then send the right
bool
+ // change video camera mode needs for-loop through all
video(mirror)cams, check camera mode against currentcamera and then send the
right bool
// bool state = true;
// VideoCamera *v = VideoCamera::setActive(state);
// look for props
- for(int i=0;i<free_prop;i++)
+ for(int i=0; i< free_prop; i++)
{
bool enabled = (props[i].cameramode == -2 ||
props[i].cameramode == currentcamera);
if(props[i].mo) props[i].mo->setMeshEnabled(enabled);
}
// look for flexbodies
- for(int i=0;i<free_flexbody;i++)
+ for(int i=0; i < free_flexbody; i++)
{
- bool enabled = (flexbodies[i]->flexBodyCameraMode == -2 ||
flexbodies[i]->flexBodyCameraMode == currentcamera);
+ bool enabled = (flexbodies[i]->cameramode == -2 ||
flexbodies[i]->cameramode == currentcamera);
flexbodies[i]->setEnabled(enabled);
}
}
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
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
