minor fixes

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: a0da173aafc1fe91ab5d005a567cd1ea12b85875
+node: 799b326e2e8a1d7ddad82d1cad19a88af98c06de
 branch: default
 latesttag: oldrender
-latesttagdistance: 275
+latesttagdistance: 280

examples/DemoBox2D/proj.marmalade/DemoBox2D.mkb

@@ -3,6 +3,7 @@
 options
 {
 	module_path="../../../oxygine/marmalade/"
+	s3e-data-dir="../data"
 	enable-exceptions=1
 }
 

oxygine/SDL/win32/oxygine_vs2013.vcxproj

@@ -160,6 +160,7 @@
     <ClCompile Include="..\..\src\res\Resources.cpp" />
     <ClCompile Include="..\..\src\res\ResStarlingAtlas.cpp" />
     <ClCompile Include="..\..\src\RootActor.cpp" />
+    <ClCompile Include="..\..\src\Serialize.cpp" />
     <ClCompile Include="..\..\src\SlidingActor.cpp" />
     <ClCompile Include="..\..\src\Sprite.cpp" />
     <ClCompile Include="..\..\src\TextActor.cpp" />
@@ -257,6 +258,7 @@
     <ClInclude Include="..\..\src\res\Resources.h" />
     <ClInclude Include="..\..\src\res\ResStarlingAtlas.h" />
     <ClInclude Include="..\..\src\RootActor.h" />
+    <ClInclude Include="..\..\src\Serialize.h" />
     <ClInclude Include="..\..\src\SlidingActor.h" />
     <ClInclude Include="..\..\src\Sprite.h" />
     <ClInclude Include="..\..\src\TextActor.h" />

oxygine/SDL/win32/oxygine_vs2013.vcxproj.filters

@@ -291,6 +291,7 @@
     <ClCompile Include="..\..\src\InputText.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\Serialize.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\closure\closure.h">
@@ -623,6 +624,7 @@
     <ClInclude Include="..\..\src\InputText.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\Serialize.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

oxygine/src/core/ref_counter.h

@@ -49,8 +49,10 @@ namespace oxygine
 #define DECLARE_SMART(class_name, spname) class class_name;\
 	typedef oxygine::intrusive_ptr<class_name> spname;
 
-#define DECLARENS_SMART(name_space, class_name, spname) namespace name_space{class class_name;\
-	typedef oxygine::intrusive_ptr<class_name> spname;\
+#define DECLARENS_SMART(name_space, class_name, spname) namespace name_space \
+	{\
+		class class_name;\
+		typedef oxygine::intrusive_ptr<class_name> spname;\
 	}
 
 }

oxygine/src/oxygine-framework.h

@@ -35,6 +35,7 @@
 #include "Tweener.h"
 #include "UpdateState.h"
 #include "VisualStyle.h"
+#include "Serialize.h"
 
 //closure/
 #include "closure/closure.h"

oxygine/src/res/ResAtlas.cpp

@@ -112,7 +112,6 @@ namespace oxygine
 
 		TextureFormat tf = string2TextureFormat(format);
 
-		pugi::xml_node child_node = node.first_child();		
 		pugi::xml_node meta_image = meta.child("atlas");
 		
 		bool compressed = false;
@@ -171,7 +170,6 @@ namespace oxygine
 					init_resAnim(ra, file, child_node);
 					ra->setParent(this);
 					context.resources->add(ra, true);
-					child_node = child_node.next_sibling();
 					continue;
 				}
 
@@ -382,13 +380,6 @@ namespace oxygine
 					ra->setParent(this);
 					context.resources->add(ra, true);
 				}
-
-
-				if (meta)
-				{
-					OX_ASSERT(meta_frames);
-					meta_frames = meta_frames.next_sibling();
-				}
 			}
 		}