Revision: 1404
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1404&view=rev
Author: rorthomas
Date: 2010-06-18 09:56:35 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
fixed beam usage of the serializer (fixed headers)
cleaned up some comments
Modified Paths:
--------------
branches/serialization/source/main/Beam.cpp
branches/serialization/source/main/CMakeLists.txt
branches/serialization/source/serializer/modules/GlobalsSerializer.cpp
Modified: branches/serialization/source/main/Beam.cpp
===================================================================
--- branches/serialization/source/main/Beam.cpp 2010-06-18 09:42:22 UTC (rev
1403)
+++ branches/serialization/source/main/Beam.cpp 2010-06-18 09:56:35 UTC (rev
1404)
@@ -67,8 +67,8 @@
#endif
#include "MeshObject.h"
-#include "serializer.h"
-#include "serializationmodules.h"
+#include "RoRSerializer.h"
+#include "RoRSerializationModules.h"
// some gcc fixes
@@ -1406,6 +1406,7 @@
loading_finished=1;
+ return 0;
}
//! @}
Modified: branches/serialization/source/main/CMakeLists.txt
===================================================================
--- branches/serialization/source/main/CMakeLists.txt 2010-06-18 09:42:22 UTC
(rev 1403)
+++ branches/serialization/source/main/CMakeLists.txt 2010-06-18 09:56:35 UTC
(rev 1404)
@@ -64,6 +64,7 @@
# serializer
include_directories(.)
include_directories(../serializer)
+include_directories(../serializer/modules)
add_executable(RoR ${HEADER_FILES} ${SOURCE_FILES})
target_link_libraries(RoR ${Ogre_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS}
${optional_libs} serializer)
Modified: branches/serialization/source/serializer/modules/GlobalsSerializer.cpp
===================================================================
--- branches/serialization/source/serializer/modules/GlobalsSerializer.cpp
2010-06-18 09:42:22 UTC (rev 1403)
+++ branches/serialization/source/serializer/modules/GlobalsSerializer.cpp
2010-06-18 09:56:35 UTC (rev 1404)
@@ -9,8 +9,6 @@
// format description:
// http://wiki.rigsofrods.com/pages/Truck_Description_File
-// the serialization modules
-//// GlobalsSerializer
GlobalsSerializer::GlobalsSerializer(RoRSerializer *s) :
RoRSerializationModule(s)
{
// setup the base descriptions, etc, then register ourself
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
