diff options
| author | Max Horn | 2003-10-05 20:21:20 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-05 20:21:20 +0000 |
| commit | bfce5e500aa09d36b974c29acf91780e0b26b459 (patch) | |
| tree | 4d750dac946597e0291a306fe649aeb374f79185 /sky/grid.cpp | |
| parent | 9f537f4b8cbb282af717a66d3912ad51602e174f (diff) | |
| download | scummvm-rg350-bfce5e500aa09d36b974c29acf91780e0b26b459.tar.gz scummvm-rg350-bfce5e500aa09d36b974c29acf91780e0b26b459.tar.bz2 scummvm-rg350-bfce5e500aa09d36b974c29acf91780e0b26b459.zip | |
renamed SkyState to SkyEngine; cleaned the #include dependency mess a bit (try to only #include files when you *have* to -> this reduces compilation time to a minimum when header file changes are made)
svn-id: r10622
Diffstat (limited to 'sky/grid.cpp')
| -rw-r--r-- | sky/grid.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sky/grid.cpp b/sky/grid.cpp index 9a26876e19..1069e6f936 100644 --- a/sky/grid.cpp +++ b/sky/grid.cpp @@ -19,8 +19,10 @@ * */ -#include "grid.h" -#include "compact.h" +#include "sky/compact.h" +#include "sky/disk.h" +#include "sky/grid.h" +#include "sky/logic.h" #define GRID_FILE_START 60000 @@ -141,7 +143,7 @@ void SkyGrid::loadGrids(void) { // no endian conversion necessary as I'm using uint8* instead of uint32* for (uint8 cnt = 0; cnt < TOT_NO_GRIDS; cnt++) _skyDisk->loadFile(GRID_FILE_START + cnt, _gameGrids + (cnt * GRID_SIZE)); - if (!SkyState::isDemo()) { // single disk demos never get that far + if (!SkyEngine::isDemo()) { // single disk demos never get that far // Reloading the grids can sometimes cause problems eg when reichs door is // open the door grid bit gets replaced so you can't get back in (or out) if (SkyLogic::_scriptVariables[REICH_DOOR_FLAG]) |