diff options
Diffstat (limited to 'engines/avalanche')
-rw-r--r-- | engines/avalanche/acci2.cpp | 7 | ||||
-rw-r--r-- | engines/avalanche/celer2.cpp | 6 | ||||
-rw-r--r-- | engines/avalanche/celer2.h | 2 | ||||
-rw-r--r-- | engines/avalanche/enhanced2.cpp | 4 | ||||
-rw-r--r-- | engines/avalanche/enhanced2.h | 2 | ||||
-rw-r--r-- | engines/avalanche/enid2.cpp | 6 | ||||
-rw-r--r-- | engines/avalanche/enid2.h | 1 | ||||
-rw-r--r-- | engines/avalanche/gyro2.cpp | 17 | ||||
-rw-r--r-- | engines/avalanche/gyro2.h | 1 | ||||
-rw-r--r-- | engines/avalanche/logger2.cpp | 6 | ||||
-rw-r--r-- | engines/avalanche/logger2.h | 1 | ||||
-rw-r--r-- | engines/avalanche/lucerna2.cpp | 6 | ||||
-rw-r--r-- | engines/avalanche/pingo2.cpp | 3 | ||||
-rw-r--r-- | engines/avalanche/pingo2.h | 3 | ||||
-rw-r--r-- | engines/avalanche/scrolls2.cpp | 15 | ||||
-rw-r--r-- | engines/avalanche/scrolls2.h | 3 | ||||
-rw-r--r-- | engines/avalanche/sequence2.cpp | 3 | ||||
-rw-r--r-- | engines/avalanche/timeout2.cpp | 6 | ||||
-rw-r--r-- | engines/avalanche/timeout2.h | 3 | ||||
-rw-r--r-- | engines/avalanche/trip6.cpp | 8 | ||||
-rw-r--r-- | engines/avalanche/trip6.h | 4 | ||||
-rw-r--r-- | engines/avalanche/visa2.cpp | 4 |
22 files changed, 48 insertions, 63 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 6ecb769c0e..2a86732b0c 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -28,11 +28,8 @@ /* ACCIDENCE II The parser. */ #include "avalanche/avalanche.h" -#include "avalanche/acci2.h" - -#include "common/textconsole.h" -#include "common/scummsys.h" +#include "avalanche/acci2.h" #include "avalanche/gyro2.h" #include "avalanche/lucerna2.h" #include "avalanche/scrolls2.h" @@ -44,6 +41,8 @@ #include "avalanche/pingo2.h" #include "avalanche/sequence2.h" +#include "common/textconsole.h" + /*#include "NimUnit.h"*/ /*#include "Highs.h"*/ diff --git a/engines/avalanche/celer2.cpp b/engines/avalanche/celer2.cpp index 2e6ce5a9ed..cec2923c7e 100644 --- a/engines/avalanche/celer2.cpp +++ b/engines/avalanche/celer2.cpp @@ -27,13 +27,15 @@ /* CELER The unit for updating the screen pics. */ +#include "avalanche/avalanche.h" + #include "avalanche/celer2.h" -#include "common/textconsole.h" #include "avalanche/trip6.h" #include "avalanche/lucerna2.h" #include "avalanche/gyro2.h" #include "avalanche/roomnums.h" -#include "avalanche/avalanche.h" + +#include "common/textconsole.h" namespace Avalanche { diff --git a/engines/avalanche/celer2.h b/engines/avalanche/celer2.h index 263d717ab9..e71dec5f19 100644 --- a/engines/avalanche/celer2.h +++ b/engines/avalanche/celer2.h @@ -30,8 +30,6 @@ #ifndef CELER2_H #define CELER2_H - - #include "common/scummsys.h" #include "common/str.h" diff --git a/engines/avalanche/enhanced2.cpp b/engines/avalanche/enhanced2.cpp index 99ddfb4340..f664d82c3c 100644 --- a/engines/avalanche/enhanced2.cpp +++ b/engines/avalanche/enhanced2.cpp @@ -25,8 +25,10 @@ * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman. */ +#include "avalanche/avalanche.h" + #include "avalanche/enhanced2.h" -#include "common/system.h" + #include "common/textconsole.h" namespace Avalanche { diff --git a/engines/avalanche/enhanced2.h b/engines/avalanche/enhanced2.h index d780f11c4c..917ed3c56c 100644 --- a/engines/avalanche/enhanced2.h +++ b/engines/avalanche/enhanced2.h @@ -32,7 +32,7 @@ #ifndef ENHANCED2_H #define ENHANCED2_H -#include "common/system.h" +#include "common/scummsys.h" namespace Avalanche { class AvalancheEngine; diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid2.cpp index 3ca6daa2af..3abb3ba84d 100644 --- a/engines/avalanche/enid2.cpp +++ b/engines/avalanche/enid2.cpp @@ -27,9 +27,6 @@ /* ENID Edna's manager. */ -#include "common/scummsys.h" -#include "common/textconsole.h" - #include "avalanche/avalanche.h" #include "avalanche/enid2.h" @@ -39,6 +36,9 @@ #include "avalanche/timeout2.h" #include "avalanche/celer2.h" #include "avalanche/sequence2.h" + +#include "common/textconsole.h" + //#include "fileunit.h" //#include "basher.h" diff --git a/engines/avalanche/enid2.h b/engines/avalanche/enid2.h index 4351354270..8c02ef194a 100644 --- a/engines/avalanche/enid2.h +++ b/engines/avalanche/enid2.h @@ -32,7 +32,6 @@ #include "common/scummsys.h" -#include "avalanche/gyro2.h" namespace Avalanche { class AvalancheEngine; diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp index a96249d67b..fd86390c04 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"; diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h index 23aa40b640..42463504a3 100644 --- a/engines/avalanche/gyro2.h +++ b/engines/avalanche/gyro2.h @@ -30,7 +30,6 @@ #ifndef GYRO2_H #define GYRO2_H -#include "common/system.h" #include "common/str.h" #include "common/scummsys.h" diff --git a/engines/avalanche/logger2.cpp b/engines/avalanche/logger2.cpp index 09643f766a..e4061dadec 100644 --- a/engines/avalanche/logger2.cpp +++ b/engines/avalanche/logger2.cpp @@ -27,12 +27,12 @@ /* LOGGER Handles the logging. */ +#include "avalanche/avalanche.h" + #include "avalanche/logger2.h" #include "avalanche/gyro2.h" -#include "avalanche/avalanche.h" -//#include "avalanche/trip6.h" +#include "avalanche/trip6.h" -#include "common/system.h" #include "common/textconsole.h" namespace Avalanche { diff --git a/engines/avalanche/logger2.h b/engines/avalanche/logger2.h index bd54823495..05a96d08ca 100644 --- a/engines/avalanche/logger2.h +++ b/engines/avalanche/logger2.h @@ -33,7 +33,6 @@ #include "common/scummsys.h" #include "common/str.h" - namespace Avalanche { class AvalancheEngine; diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index 22ae5b536e..344c273cdb 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -29,14 +29,11 @@ #include "avalanche/avalanche.h" -#include "common/system.h" #include "avalanche/lucerna2.h" #include "avalanche/gyro2.h" #include "avalanche/scrolls2.h" #include "avalanche/logger2.h" #include "avalanche/enhanced2.h" - - #include "avalanche/visa2.h" #include "avalanche/timeout2.h" #include "avalanche/trip6.h" @@ -44,8 +41,9 @@ #include "avalanche/celer2.h" #include "avalanche/pingo2.h" #include "avalanche/sequence2.h" -//#include "avalanche/acci2.h" +#include "avalanche/acci2.h" +#include "common/system.h" //#include "dropdown.h" //#include "basher.h" diff --git a/engines/avalanche/pingo2.cpp b/engines/avalanche/pingo2.cpp index b2f8e83886..92c22e65bf 100644 --- a/engines/avalanche/pingo2.cpp +++ b/engines/avalanche/pingo2.cpp @@ -30,11 +30,10 @@ #include "avalanche/avalanche.h" #include "avalanche/pingo2.h" - #include "avalanche/gyro2.h" #include "avalanche/lucerna2.h" #include "avalanche/trip6.h" -//#include "avalanche/scrolls2.h" +#include "avalanche/scrolls2.h" #include "common/textconsole.h" diff --git a/engines/avalanche/pingo2.h b/engines/avalanche/pingo2.h index 135bb10c20..28f140f7d4 100644 --- a/engines/avalanche/pingo2.h +++ b/engines/avalanche/pingo2.h @@ -33,9 +33,6 @@ #include "common/scummsys.h" #include "common/str.h" - - - namespace Avalanche { class AvalancheEngine; diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index a577483463..40084148b5 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -31,16 +31,17 @@ #include "avalanche/gyro2.h" #include "avalanche/logger2.h" #include "avalanche/enhanced2.h" - -//#include "lucerna.h" -//#include "trip5.h" -//#include "Acci.h" -//#include "basher.h" -//#include "visa.h" -//#include "timeout.h" +#include "avalanche/lucerna2.h" +#include "avalanche/trip6.h" +#include "avalanche/acci2.h" +#include "avalanche/visa2.h" +#include "avalanche/timeout2.h" #include "common/textconsole.h" +//#include "basher.h" +//#include "avalanche/joystick2.h" - Will be implemented later, if it will be implemented at all... + namespace Avalanche { const int16 Scrolls::roman = 0; diff --git a/engines/avalanche/scrolls2.h b/engines/avalanche/scrolls2.h index 914e463f3f..fa52a55905 100644 --- a/engines/avalanche/scrolls2.h +++ b/engines/avalanche/scrolls2.h @@ -30,9 +30,6 @@ #include "common/system.h" -#include "avalanche/gyro2.h" -// #include "avalanche/joystick2.h" - Will be implemented later, if it will be implemented at all... - namespace Avalanche { class AvalancheEngine; diff --git a/engines/avalanche/sequence2.cpp b/engines/avalanche/sequence2.cpp index 2d9bd25550..afa74d69b4 100644 --- a/engines/avalanche/sequence2.cpp +++ b/engines/avalanche/sequence2.cpp @@ -30,12 +30,13 @@ #include "avalanche/avalanche.h" #include "avalanche/sequence2.h" -#include "common/scummsys.h" #include "avalanche/gyro2.h" #include "avalanche/timeout2.h" #include "avalanche/celer2.h" #include "avalanche/trip6.h" +#include "common/scummsys.h" + namespace Avalanche { void Sequence::setParent(AvalancheEngine *vm) { diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp index b4955f6ed6..343e896e30 100644 --- a/engines/avalanche/timeout2.cpp +++ b/engines/avalanche/timeout2.cpp @@ -29,12 +29,10 @@ // DON'T FORGET ABOUT THE ARRAY INDEXES, THEY MAY'LL CAUSE TROUBLES!!! -#include "common/textconsole.h" - -#include "avalanche/timeout2.h" #include "avalanche/avalanche.h" +#include "avalanche/timeout2.h" #include "avalanche/visa2.h" #include "avalanche/lucerna2.h" #include "avalanche/trip6.h" @@ -44,6 +42,8 @@ #include "avalanche/enid2.h" #include "avalanche/pingo2.h" +#include "common/textconsole.h" + namespace Avalanche { Timeout::Timeout() { diff --git a/engines/avalanche/timeout2.h b/engines/avalanche/timeout2.h index f7e984e42f..07a48d6ad0 100644 --- a/engines/avalanche/timeout2.h +++ b/engines/avalanche/timeout2.h @@ -32,9 +32,6 @@ #include "common/scummsys.h" -#include "avalanche/gyro2.h" -#include "avalanche/celer2.h" - namespace Avalanche { class AvalancheEngine; diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp index 5baa73d32e..039c7693a7 100644 --- a/engines/avalanche/trip6.cpp +++ b/engines/avalanche/trip6.cpp @@ -27,12 +27,9 @@ /* TRIP5 Trippancy V */ -#include "avalanche/trip6.h" -#include "common/scummsys.h" -#include "common/textconsole.h" - #include "avalanche/avalanche.h" +#include "avalanche/trip6.h" #include "avalanche/scrolls2.h" #include "avalanche/lucerna2.h" #include "avalanche/visa2.h" @@ -42,6 +39,9 @@ #include "avalanche/timeout2.h" #include "avalanche/enid2.h" +#include "common/scummsys.h" +#include "common/textconsole.h" + /*#include "Dropdown.h"*/ diff --git a/engines/avalanche/trip6.h b/engines/avalanche/trip6.h index be805fbe03..d7b5637542 100644 --- a/engines/avalanche/trip6.h +++ b/engines/avalanche/trip6.h @@ -31,13 +31,9 @@ #ifndef TRIP6_H #define TRIP6_H - - #include "common/scummsys.h" #include "common/str.h" -#include "avalanche/gyro2.h" - namespace Avalanche { class AvalancheEngine; diff --git a/engines/avalanche/visa2.cpp b/engines/avalanche/visa2.cpp index a14367a6a8..e53f55aef4 100644 --- a/engines/avalanche/visa2.cpp +++ b/engines/avalanche/visa2.cpp @@ -32,12 +32,12 @@ #include "avalanche/visa2.h" #include "avalanche/gyro2.h" #include "avalanche/scrolls2.h" -//#include "avalanche/acci2.h" +#include "avalanche/acci2.h" #include "avalanche/lucerna2.h" +#include "avalanche/trip6.h" #include "common/textconsole.h" -/*#include "Trip5.h"*/ namespace Avalanche { |