aboutsummaryrefslogtreecommitdiffstats
path: root/src/gameplay.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gameplay.cpp')
-rw-r--r--src/gameplay.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 94fb954..431d2cf 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -126,13 +126,13 @@ void initEverything(void){
worldSpawnHill1 = new World();
worldSpawnHill1->setBackground(BG_FOREST);
- if(!i.fail()){
- worldSpawnHill1->load(&i);
- i.close();
- }else{
+ // if(!i.fail()){
+ // worldSpawnHill1->load(&i);
+ // i.close();
+ // }else{
worldSpawnHill1->generateFunc(400,gen_worldSpawnHill1);
worldSpawnHill1->setBGM("assets/music/embark.wav");
- }
+ // }
worldSpawnHill1->addMob(MS_TRIGGER,0,0,worldSpawnHill1_hillBlock);
worldSpawnHill2 = new World();
@@ -177,10 +177,12 @@ void initEverything(void){
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->getAvailableNPC()->addAIFunc(worldSpawnHill2_Quest1,false);
worldFirstVillage->addVillage(5,0,0,STRUCTURET,worldSpawnHill2_Building1);
+ //worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2);
player = new Player();
player->spawn(200,100);