shit

1 files changed, 25 insertions, 4 deletions

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index a9d29c4..70630dd 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -48,9 +48,17 @@ void worldSpawnHill1_hillBlock(Mob *callee){
 	callee->alive = true;
 }
 
+static Arena *a;
 void worldSpawnHill2_infoSprint(Mob *callee){
-	ui::dialogBox("B-) ",NULL,true,"Press \'Shift\' to run!");
 	callee->alive = false;
+	a = new Arena(currentWorld,player);
+	a->setBackground(BG_FOREST);
+	a->setBGM("assets/music/embark.wav");
+	ui::toggleWhiteFast();
+	ui::waitForCover();
+	currentWorld = a;
+	ui::toggleWhiteFast();
+	//ui::dialogBox("B-) ",NULL,true,"Press \'Shift\' to run!");
 }
 
 void worldSpawnHill3_itemGet(Mob *callee){
@@ -103,7 +111,7 @@ void initEverything(void){
 	worldSpawnHill2->setBackground(BG_FOREST);
 	worldSpawnHill2->setBGM("assets/music/embark.wav");
 	worldSpawnHill2->addMob(MS_TRIGGER,-400,0,worldSpawnHill2_infoSprint);
-	
+
 	worldSpawnHill3 = new World();
 	worldSpawnHill3->generateFunc(1000,gen_worldSpawnHill3);
 	worldSpawnHill3->setBackground(BG_FOREST);
@@ -116,10 +124,23 @@ void initEverything(void){
 	
 	worldSpawnHill1->toRight = worldSpawnHill2;
 	worldSpawnHill2->toLeft = worldSpawnHill1;
-	
 	worldSpawnHill2->toRight = worldSpawnHill3;
 	worldSpawnHill3->toLeft = worldSpawnHill2;
-	
+
+	/*
+	 *	Spawn some entities.
+	*/
+
+	//playerSpawnHill->addMob(MS_TRIGGER,player->loc.x,0,story);
+
+	//worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
+	//playerSpawnHill->addStructure(STRUCTURET,FOUNTAIN,(rand()%120*HLINE)+100*HLINE,100,test,iw);
+	//playerSpawnHill->addStructure(STRUCTURET,HOUSE2,(rand()%120*HLINE)+300*HLINE,100,test,iw);
+
+	//playerSpawnHill->addVillage(5,1,4,STRUCTURET,rand()%500+120,(float)200,playerSpawnHill,iw);
+	//playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE);*/
+
+
 	currentWorld = worldSpawnHill1;
 	
 	player = new Player();