diff options
author | Max Horn | 2004-12-17 22:27:15 +0000 |
---|---|---|
committer | Max Horn | 2004-12-17 22:27:15 +0000 |
commit | b93dd59a44f73f744bbf3d0d60e0ce509667eccc (patch) | |
tree | 6bc844d730e28eaf62592d9647343035cc5ba00e /scumm/scumm.h | |
parent | 79ce4de9423797abb768657942e6af425a2e84ea (diff) | |
download | scummvm-rg350-b93dd59a44f73f744bbf3d0d60e0ce509667eccc.tar.gz scummvm-rg350-b93dd59a44f73f744bbf3d0d60e0ce509667eccc.tar.bz2 scummvm-rg350-b93dd59a44f73f744bbf3d0d60e0ce509667eccc.zip |
Reduce code size of resource.cpp to help PalmOS port, by moving util code to a new file util.cpp and sound resource code to sound.cpp
svn-id: r16105
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r-- | scumm/scumm.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 79ece5d928..df1fddfa7b 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -31,6 +31,7 @@ #include "scumm/gfx.h" #include "scumm/script.h" +#include "scumm/util.h" #include "scumm/wiz_he.h" namespace GUI { @@ -61,29 +62,6 @@ struct ScummGameSettings; typedef Common::Map<Common::String, int> ObjectIDMap; -class ScummFile : public File { -private: - byte _encbyte; - uint32 _subFileStart; - uint32 _subFileLen; -public: - ScummFile(); - void setEnc(byte value); - - void setSubfileRange(uint32 start, uint32 len); - void resetSubfile(); - - bool open(const char *filename, AccessMode mode = kFileReadMode); - bool openSubFile(const char *filename); - - bool eof(); - uint32 pos(); - uint32 size(); - void seek(int32 offs, int whence = SEEK_SET); - uint32 read(void *ptr, uint32 size); - uint32 write(const void *ptr, uint32 size); -}; - // Use g_scumm from error() ONLY extern ScummEngine *g_scumm; @@ -1333,21 +1311,6 @@ public: byte VAR_WIZ_TCOLOR; }; -// This is a constant lookup table of reverse bit masks -extern const byte revBitMask[8]; - -/* Direction conversion functions (between old dir and new dir format) */ -int newDirToOldDir(int dir); -int oldDirToNewDir(int dir); - -int normalizeAngle(int angle); -int fromSimpleDir(int dirtype, int dir); -int toSimpleDir(int dirtype, int dir); - -void checkRange(int max, int min, int no, const char *str); - -const char *tag2str(uint32 tag); - } // End of namespace Scumm #endif |