diff options
| author | Max Horn | 2005-04-10 12:59:17 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-10 12:59:17 +0000 |
| commit | 871e278f8be3fc4b27fadca50922dd2193dbd409 (patch) | |
| tree | cf9be444f841cf731d1f0748cc1a97dceda4d32b /scumm/scumm.h | |
| parent | e3fbf090350f6a967cc04d9804dbb4ed64e7a1af (diff) | |
| download | scummvm-rg350-871e278f8be3fc4b27fadca50922dd2193dbd409.tar.gz scummvm-rg350-871e278f8be3fc4b27fadca50922dd2193dbd409.tar.bz2 scummvm-rg350-871e278f8be3fc4b27fadca50922dd2193dbd409.zip | |
Reduce dependencies on scumm/util.h; modified ScummNESFile a bit so that it complies a bit better with our code formatting rules
svn-id: r17508
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 6a6227aebd..b8e2ed8e11 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -31,7 +31,6 @@ #include "scumm/gfx.h" #include "scumm/script.h" -#include "scumm/util.h" namespace GUI { class Dialog; @@ -45,6 +44,7 @@ namespace Scumm { class Actor; class BaseCostumeLoader; class BaseCostumeRenderer; +class BaseScummFile; class CharsetRenderer; class IMuse; class IMuseDigital; @@ -1210,12 +1210,7 @@ public: protected: byte *_2byteFontPtr; - -#if defined(SCUMM_LITTLE_ENDIAN) - uint32 fileReadDword() { return _fileHandle->readUint32LE(); } -#elif defined(SCUMM_BIG_ENDIAN) - uint32 fileReadDword() { return _fileHandle->readUint32BE(); } -#endif + uint32 fileReadDword(); public: |