removed examples

fixed marmalade

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 98dd1ddf4012c28e1a3fb3d7d9196a444ee56680
+node: 70eb2f326149b3bcec284ea7773dd8d2a215952c
 branch: default
 latesttag: oldrender
-latesttagdistance: 39
+latesttagdistance: 40

examples/Demo/src/TestComplexDrag.h

@@ -1,61 +0,0 @@
-#pragma once
-#include "test.h"
-#include "ClipRectActor.h"
-#include "PointerState.h"
-#include "SlidingActor.h"
-
-class TestComplexDrag: public Test
-{
-public:
-	TestComplexDrag()
-	{
-		spSprite innerContent = new Sprite;
-		innerContent->setAnimFrame(resources.getResAnim("slide"));
-
-		float x = 0;
-		for (int i = 0; i < 5; ++i)
-		{
-			spButton button = new Button;			
-			button->setResAnim(resourcesUI.getResAnim("button"));
-
-			Vector2 pos(x, 100);
-			pos.y = 0;
-			button->setPosition(pos);
-			button->attachTo(innerContent);
-			button->setName("button");
-			button->addEventListener(TouchEvent::CLICK, CLOSURE(this, &TestComplexDrag::testClick));
-			x += 200;
-		}
-
-		spSlidingActor frame = new SlidingActor();
-		frame->setSize(Vector2(400, innerContent->getHeight()));
-		frame->setContent(innerContent);
-		frame->setPosition(getWidth()/2 - frame->getWidth()/2, 50.0f);
-		frame->attachTo(this->content);
-
-		spColorRectSprite innerContent2 = new ColorRectSprite();
-		innerContent2->setSize(800, 200);
-		innerContent2->setColor(Color(128,128,128,255));
-		for (int i = 0; i < 8; i++)
-		{
-			spColorRectSprite c = new ColorRectSprite;
-			c->setSize(100, 100);
-			c->setX(i * 100.0f);
-			c->setY((i % 2) * 100.0f);
-			c->attachTo(innerContent2);
-
-		}
-
-		frame = new SlidingActor();
-		frame->setSnapPageSize(Vector2(100, 100));
-		frame->setSize(Vector2(400, 100));
-		frame->setContent(innerContent2);
-		frame->setPosition(getWidth()/2 - frame->getWidth()/2, 400.0f);
-		frame->attachTo(this->content);
-	}
-
-	void testClick(Event *event)
-	{
-		showPopup("clicked");
-	}
-};

oxygine/src/core/STDFileSystem.cpp

@@ -170,7 +170,7 @@ namespace oxygine
 			if (_readonly)
 			{
 #if __S3E__
-				sprintf(buff, "rom://%s", path);
+				sprintf(buff, "rom://%s%s", _path.c_str(), path);
 #else
 				sprintf(buff, "%s%s", _path.c_str(), path);
 #endif
@@ -178,7 +178,7 @@ namespace oxygine
 			else
 			{
 #if __S3E__
-				sprintf(buff, "ram://%s", path);
+				sprintf(buff, "ram://%s%s", _path.c_str(), path);
 #else
 	#ifdef  WIN32
 				sprintf(buff, "../data-ram/%s%s", _path.c_str(), path);