Revision: 1453
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1453&view=rev
Author: rorthomas
Date: 2010-07-16 21:01:19 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
fixed gcc fix (by cptf)
added protocol directory
Modified Paths:
--------------
trunk/source/configurator/CMakeLists.txt
trunk/source/configurator/ImprovedConfigFile.h
trunk/source/main/Beam.cpp
trunk/source/main/CMakeLists.txt
trunk/source/main/ImprovedConfigFile.h
trunk/source/main/RoR.list
trunk/source/main/mplatform_base.h
trunk/source/main/network.cpp
Modified: trunk/source/configurator/CMakeLists.txt
===================================================================
--- trunk/source/configurator/CMakeLists.txt 2010-07-16 20:28:44 UTC (rev
1452)
+++ trunk/source/configurator/CMakeLists.txt 2010-07-16 21:01:19 UTC (rev
1453)
@@ -7,6 +7,7 @@
link_directories (${PThread_LIBRARY_DIRS})
include_directories(${WXWIDGETS_SHARED_INCLUDE_DIRS})
link_directories (${WXWIDGETS_SHARED_LIBRARY_DIRS})
+ include_directories(${RoR_SOURCE_DIR}/source/protocol)
set(OS_LIBS "${PThread_LIBRARIES} dinput8.lib dxguid.lib")
set(OS_SOURCE "icon.rc")
Modified: trunk/source/configurator/ImprovedConfigFile.h
===================================================================
--- trunk/source/configurator/ImprovedConfigFile.h 2010-07-16 20:28:44 UTC
(rev 1452)
+++ trunk/source/configurator/ImprovedConfigFile.h 2010-07-16 21:01:19 UTC
(rev 1453)
@@ -31,7 +31,7 @@
public:
ImprovedConfigFile() : separators(), filename()
{
- ConfigFile::ConfigFile();
+ ConfigFile();
}
~ImprovedConfigFile()
Modified: trunk/source/main/Beam.cpp
===================================================================
--- trunk/source/main/Beam.cpp 2010-07-16 20:28:44 UTC (rev 1452)
+++ trunk/source/main/Beam.cpp 2010-07-16 21:01:19 UTC (rev 1453)
@@ -66,6 +66,7 @@
#include "ScriptEngine.h"
#endif
+#include "rornet.h"
#include "MeshObject.h"
Modified: trunk/source/main/CMakeLists.txt
===================================================================
--- trunk/source/main/CMakeLists.txt 2010-07-16 20:28:44 UTC (rev 1452)
+++ trunk/source/main/CMakeLists.txt 2010-07-16 21:01:19 UTC (rev 1453)
@@ -38,6 +38,8 @@
set(OS_LIBS "X11")
ENDIF(WIN32)
+include_directories(${RoR_SOURCE_DIR}/source/protocol)
+
# required components
include_directories(${Ogre_INCLUDE_DIRS})
link_directories (${Ogre_LIBRARY_DIRS})
Modified: trunk/source/main/ImprovedConfigFile.h
===================================================================
--- trunk/source/main/ImprovedConfigFile.h 2010-07-16 20:28:44 UTC (rev
1452)
+++ trunk/source/main/ImprovedConfigFile.h 2010-07-16 21:01:19 UTC (rev
1453)
@@ -31,7 +31,7 @@
public:
ImprovedConfigFile() : separators(), filename()
{
- ConfigFile::ConfigFile();
+ ConfigFile();
}
~ImprovedConfigFile()
Modified: trunk/source/main/RoR.list
===================================================================
--- trunk/source/main/RoR.list 2010-07-16 20:28:44 UTC (rev 1452)
+++ trunk/source/main/RoR.list 2010-07-16 21:01:19 UTC (rev 1453)
@@ -110,7 +110,6 @@
SoundScriptManager.h
network.h
NetworkStreamManager.h
- rornet.h
Streamable.h
StreamableFactory.h
resource.h
@@ -469,7 +468,6 @@
network.h
NetworkStreamManager.cpp
NetworkStreamManager.h
- rornet.h
Streamable.cpp
Streamable.h
StreamableFactory.h
Modified: trunk/source/main/mplatform_base.h
===================================================================
--- trunk/source/main/mplatform_base.h 2010-07-16 20:28:44 UTC (rev 1452)
+++ trunk/source/main/mplatform_base.h 2010-07-16 21:01:19 UTC (rev 1453)
@@ -11,6 +11,38 @@
#include "Ogre.h"
#include "rornet.h"
+
+typedef struct // struct is used for motion platforms
+{
+ int time;
+
+ float x; // absolute coordinates
+ float y;
+ float z;
+
+ float x_acc; // accelerations regarding to different vectors
+ float y_acc;
+ float z_acc;
+
+ float head; // orientations
+ float roll;
+ float pitch;
+
+ float head_acc; // accelerations of orientations
+ float roll_acc;
+ float pitch_acc;
+
+ float steer; // user inputs
+ float throttle;
+ float brake;
+ float clutch;
+
+ float speed; // different stats
+ float rpm;
+ int gear;
+ float avg_friction;
+} mstat_t;
+
class MPlatform_Base
{
public:
Modified: trunk/source/main/network.cpp
===================================================================
--- trunk/source/main/network.cpp 2010-07-16 20:28:44 UTC (rev 1452)
+++ trunk/source/main/network.cpp 2010-07-16 21:01:19 UTC (rev 1453)
@@ -459,7 +459,7 @@
void Network::disconnect()
{
shutdown=true;
- sendmessage(&socket, MSG2_DELETE, 0, 0, 0);
+ sendmessage(&socket, MSG2_USER_LEAVE, 0, 0, 0);
SWBaseSocket::SWBaseError error;
socket.set_timeout(1, 1000);
socket.disconnect(&error);
@@ -540,7 +540,7 @@
if(cs) cs->addReceivedPacket(header, buffer);
continue;
}
- else if(header.command == MSG2_USER_LEAVE || header.command ==
MSG2_DELETE)
+ else if(header.command == MSG2_USER_LEAVE)
{
// remove all things that belong to that user
client_t *client = getClientInfo(header.source);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
