Hey, that's pretty good lighting!

1 files changed, 15 insertions, 7 deletions

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index d439814..1c83bd8 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -42,6 +42,7 @@ float gen_worldSpawnHill3(float x){
  */
 
 void worldSpawnHill1_hillBlock(Mob *callee){
+	std::cout<<"oi";
 	player->vel.x = 0;
 	player->loc.x = callee->loc.x + callee->width;
 	ui::dialogBox(player->name,NULL,false,"This hill seems to steep to climb up...");
@@ -93,6 +94,8 @@ static World *worldSpawnHill1;
 static World *worldSpawnHill2;
 static World *worldSpawnHill3;
 
+static IndoorWorld *worldSpawnHill2_Building1;
+
 /*
  *	initEverything() start
  */
@@ -118,8 +121,8 @@ void initEverything(void){
 	worldSpawnHill3->setBGM("assets/music/ozone.wav");
 	worldSpawnHill3->addMob(MS_TRIGGER,-500,0,worldSpawnHill3_itemGet);
 	worldSpawnHill3->addMob(MS_TRIGGER,0,0,worldSpawnHill3_itemSee);
-	worldSpawnHill3->addObject(TEST_ITEM,false,"",-200,300);
-	worldSpawnHill3->addMob(MS_TRIGGER,400,0,worldSpawnHill3_leave);
+	worldSpawnHill3->addObject(FLASHLIGHT,false,"",-200,300);
+	worldSpawnHill3->addMob(MS_TRIGGER,650,0,worldSpawnHill3_leave);
 	worldSpawnHill3->addHole(800,1000);
 	
 	worldSpawnHill1->toRight = worldSpawnHill2;
@@ -140,15 +143,20 @@ void initEverything(void){
 	//playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE);*/
 
 
-	currentWorld = worldSpawnHill1;
-	worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
+	worldSpawnHill2_Building1 = new IndoorWorld();
+	worldSpawnHill2_Building1->generate(300);
+	worldSpawnHill2_Building1->setBackground(BG_WOODHOUSE);
+	worldSpawnHill2_Building1->setBGM("assets/music/theme_jazz.wav");
+
+	worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill2_Building1);
+	worldSpawnHill2->addLight({300,100},{1.0f,1.0f,1.0f});
 	
-	worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
+	//worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
 	player = new Player();
 	player->spawn(200,100);
-	
+
+	currentWorld = worldSpawnHill1;	
 	currentWorld->bgmPlay(NULL);
-	
 	atexit(destroyEverything);
 }