Revision: 2690
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2690&view=rev
Author: rorthomas
Date: 2012-05-26 04:03:03 +0000 (Sat, 26 May 2012)
Log Message:
-----------
small fixes
Modified Paths:
--------------
trunk/source/main/RoRPrerequisites.h
trunk/source/main/framework/GameState.cpp
trunk/source/main/gameplay/RoRFrameListener.h
trunk/source/main/gameplay/autopilot.h
trunk/source/main/physics/BeamData.h
trunk/source/main/terrain/TerrainObjectManager.h
Modified: trunk/source/main/RoRPrerequisites.h
===================================================================
--- trunk/source/main/RoRPrerequisites.h 2012-05-26 03:57:19 UTC (rev
2689)
+++ trunk/source/main/RoRPrerequisites.h 2012-05-26 04:03:03 UTC (rev
2690)
@@ -226,7 +226,6 @@
FWDCLSTRUCT(ground_model);
FWDCLSTRUCT(client);
FWDCLSTRUCT(authorinfo);
-FWDCLSTRUCT(localizer);
enum VisibilityMasks {
DEPTHMAP_ENABLED = BITMASK(1),
Modified: trunk/source/main/framework/GameState.cpp
===================================================================
--- trunk/source/main/framework/GameState.cpp 2012-05-26 03:57:19 UTC (rev
2689)
+++ trunk/source/main/framework/GameState.cpp 2012-05-26 04:03:03 UTC (rev
2690)
@@ -50,7 +50,7 @@
OgreFramework::getSingleton().m_pRoot->addFrameListener(mFrameListener);
- gEnv->framelistener = mFrameListener;
+ gEnv->frameListener = mFrameListener;
}
Modified: trunk/source/main/gameplay/RoRFrameListener.h
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.h 2012-05-26 03:57:19 UTC
(rev 2689)
+++ trunk/source/main/gameplay/RoRFrameListener.h 2012-05-26 04:03:03 UTC
(rev 2690)
@@ -22,7 +22,7 @@
#include "RoRPrerequisites.h"
-#include "BeamData.h" // for localizer_t
+#include "BeamData.h"
#include "Ogre.h"
#include <pthread.h>
Modified: trunk/source/main/gameplay/autopilot.h
===================================================================
--- trunk/source/main/gameplay/autopilot.h 2012-05-26 03:57:19 UTC (rev
2689)
+++ trunk/source/main/gameplay/autopilot.h 2012-05-26 04:03:03 UTC (rev
2690)
@@ -21,6 +21,7 @@
#define AUTOPILOT_H__
#include "RoRPrerequisites.h"
+#include "TerrainObjectManager.h"
class Autopilot
{
Modified: trunk/source/main/physics/BeamData.h
===================================================================
--- trunk/source/main/physics/BeamData.h 2012-05-26 03:57:19 UTC (rev
2689)
+++ trunk/source/main/physics/BeamData.h 2012-05-26 04:03:03 UTC (rev
2690)
@@ -1121,11 +1121,4 @@
Ogre::String email;
};
-struct localizer
-{
- int type;
- Ogre::Vector3 position;
- Ogre::Quaternion rotation;
-};
-
#endif //BEAMDATA_H__
Modified: trunk/source/main/terrain/TerrainObjectManager.h
===================================================================
--- trunk/source/main/terrain/TerrainObjectManager.h 2012-05-26 03:57:19 UTC
(rev 2689)
+++ trunk/source/main/terrain/TerrainObjectManager.h 2012-05-26 04:03:03 UTC
(rev 2690)
@@ -58,6 +58,13 @@
Road *road;
+ typedef struct localizer_t
+ {
+ int type;
+ Ogre::Vector3 position;
+ Ogre::Quaternion rotation;
+ } localizer_t;
+
localizer_t localizers[64];
void loadObject(const char* name, float px, float py, float pz, float
rx, float ry, float rz, Ogre::SceneNode * bakeNode, const char* instancename,
bool enable_collisions=true, int scripthandler=-1, const char *type=0, bool
uniquifyMaterial=false);
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
