AVALANCHE: Reorganise includes.

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/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"*/

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 {
 

engines/avalanche/celer2.h

@@ -30,8 +30,6 @@
 #ifndef CELER2_H
 #define CELER2_H
 
-
-
 #include "common/scummsys.h"
 #include "common/str.h"
 

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 {

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;

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"
 

engines/avalanche/enid2.h

@@ -32,7 +32,6 @@
 
 #include "common/scummsys.h"
 
-#include "avalanche/gyro2.h"
 
 namespace Avalanche {
 class AvalancheEngine;

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";

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"
 

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 {

engines/avalanche/logger2.h

@@ -33,7 +33,6 @@
 #include "common/scummsys.h"
 #include "common/str.h"
 
-
 namespace Avalanche {
 class AvalancheEngine;
 

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"

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"
 

engines/avalanche/pingo2.h

@@ -33,9 +33,6 @@
 #include "common/scummsys.h"
 #include "common/str.h"
 
-
-
-
 namespace Avalanche {
 class AvalancheEngine;
 

engines/avalanche/scrolls2.cpp

@@ -31,16 +31,17 @@
 #include "avalanche/gyro2.h"
 #include "avalanche/logger2.h"
 #include "avalanche/enhanced2.h"
-
+#include "avalanche/lucerna2.h"
-//#include "lucerna.h"
+#include "avalanche/trip6.h"
-//#include "trip5.h"
+#include "avalanche/acci2.h"
-//#include "Acci.h"
+#include "avalanche/visa2.h"
-//#include "basher.h"
+#include "avalanche/timeout2.h"
-//#include "visa.h"
-//#include "timeout.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;

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;
 

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) {

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() {

engines/avalanche/timeout2.h

@@ -32,9 +32,6 @@
 
 #include "common/scummsys.h"
 
-#include "avalanche/gyro2.h"
-#include "avalanche/celer2.h"
-
 namespace Avalanche {
 class AvalancheEngine;
 

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"*/
 
 

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;
 

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 {