diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-07 08:37:49 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-07 08:37:49 -0500 |
commit | 81cf23371b94baf608c98d0dd248acfbbd5d2c70 (patch) | |
tree | 42282b56ce04e17fcc3f61d6b356b6ac72250915 /src/gameplay.cpp | |
parent | cdd792bc8ba7337e7bd3a9d0b4141c63f17fb9a8 (diff) | |
parent | e043a2432c4dacce56a308948188482fb230ff33 (diff) |
merge
Diffstat (limited to 'src/gameplay.cpp')
-rw-r--r-- | src/gameplay.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 5b9f509..e8436e7 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -178,10 +178,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); |