Started inv ui, new item system

1 files changed, 23 insertions, 4 deletions

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 18bf327..92d1284 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -70,9 +70,26 @@ int giveTestQuest(NPC *speaker){
 	return 0;
 }
 
+static Arena *a;
+
+void CUTSCENEEE(void){
+	char opt[]=":K.";
+	player->vel.x = 0;
+	ui::dialogBox(player->name,opt,"No way I\'m gettin\' up this hill.");
+	
+	waitForDialog();
+
+	a = new Arena(currentWorld,player);
+	
+	currentWorld = a;
+	
+	/*player->right = true;
+	player->left  = false;
+	player->loc.x += HLINE * 5;*/
+}
+
 float playerSpawnHillFunc(float x){
-	x=-x;
-	return (float)(pow(2,(x+200)/5) + 80);
+	return (float)(pow(2,(-x+200)/5) + 80);
 }
 void initEverything(void){
 	unsigned int i;
@@ -133,12 +150,14 @@ void initEverything(void){
 	currentWorld->addStructure(STRUCTURET,(rand()%120*HLINE),10,test,iw);
 	
 	/*
-	 *	Spawn a mob. 
+	 *	Spawn some mobs.
 	*/
+
+	playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE);
 	
 	test->addMob(MS_RABBIT,200,100);
 	test->addMob(MS_BIRD,-500,500);
-
+	
 	currentWorld->addObject(SWORD_WOOD, 500,200);
 	currentWorld->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",600,200);
 	/*