diff options
| author | Strangerke | 2013-06-30 14:14:31 +0200 |
|---|---|---|
| committer | Strangerke | 2013-06-30 14:14:31 +0200 |
| commit | 63737c3878a4e6c22d7dc4d67cfbd59310e46c67 (patch) | |
| tree | e55d04b8aee535885380ca3f50ea27e4229becdf /engines/avalanche/gyro2.cpp | |
| parent | 7c147c920fb9e780a78a452cbe123ed0cd94a190 (diff) | |
| parent | 1d11268eb486a28bf471c277a407954ccfcda212 (diff) | |
| download | scummvm-rg350-63737c3878a4e6c22d7dc4d67cfbd59310e46c67.tar.gz scummvm-rg350-63737c3878a4e6c22d7dc4d67cfbd59310e46c67.tar.bz2 scummvm-rg350-63737c3878a4e6c22d7dc4d67cfbd59310e46c67.zip | |
Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche
Conflicts:
engines/avalanche/timeout2.cpp
engines/avalanche/trip6.cpp
Diffstat (limited to 'engines/avalanche/gyro2.cpp')
| -rw-r--r-- | engines/avalanche/gyro2.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp index a0676f47ab..c247012256 100644 --- a/engines/avalanche/gyro2.cpp +++ b/engines/avalanche/gyro2.cpp @@ -27,20 +27,21 @@ /* GYRO It all revolves around this bit! */ +#include "avalanche/avalanche.h" + #include "avalanche/gyro2.h" +#include "avalanche/pingo2.h" +#include "avalanche/scrolls2.h" +#include "avalanche/lucerna2.h" +#include "avalanche/visa2.h" +#include "avalanche/acci2.h" +#include "avalanche/trip6.h" + #include "common/textconsole.h" -//#include "pingo.h" -//#include "scrolls.h" -//#include "lucerna.h" -//#include "visa.h" -//#include "acci.h" -//#include "trip5.h" //#include "dropdown.h" //#include "basher.h" - - namespace Avalanche { const char *Gyro::vernum = "1.30"; |