diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-10 08:13:19 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-12-10 08:13:19 -0500 |
| commit | b477db406b9d7aa4f62a750c9ae3c3cedc533b3b (patch) | |
| tree | 9569502fce81d8f34da226bedb4ccb4fa0e6ea9c /src/gameplay.cpp | |
| parent | b28023525c6dcf2360c8d03b405d46af4e0e1c6d (diff) | |
| parent | 2baf10d54f1cbfdb781b9b37987e0815dbdafc3f (diff) | |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/gameplay.cpp')
| -rw-r--r-- | src/gameplay.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp index fbcc782..b9aa328 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -55,18 +55,6 @@ void story(Mob *callee){ Mix_FadeOutMusic(0); ui::importantText("It was a dark and stormy night..."); ui::waitForDialog(); - ui::importantText("...and Clyne wanted to hear what the click track sounds like."); - ui::waitForDialog(); - ui::importantText("So Clyne made a really long piece of dialog so that the sound"); - ui::waitForDialog(); - ui::importantText("plays"); - ui::waitForDialog(); - ui::importantText("multiple"); - ui::waitForDialog(); - ui::importantText("times."); - ui::waitForDialog(); - ui::importantText("Clyne is a faggot."); - ui::waitForDialog(); callee->alive = false; } @@ -129,6 +117,7 @@ void initEverything(void){ iw=new IndoorWorld(); iw->setBackground(BG_WOODHOUSE); + iw->setBGM(NULL); iw->generate(200); iw->addMob(MS_TRIGGER,0,0,CUTSCENEEE2); |