diff options
author | Joost Peters | 2003-10-05 16:07:07 +0000 |
---|---|---|
committer | Joost Peters | 2003-10-05 16:07:07 +0000 |
commit | 36ed0b1d3c662743f638fc7c9275f6952542c23d (patch) | |
tree | 44bcf13ee9b060c3a5ef19a5dff3875cdee6c987 /queen/cutaway.h | |
parent | 47e3b8f55d55530b6b6593c02d57a33d1767cd4c (diff) | |
download | scummvm-rg350-36ed0b1d3c662743f638fc7c9275f6952542c23d.tar.gz scummvm-rg350-36ed0b1d3c662743f638fc7c9275f6952542c23d.tar.bz2 scummvm-rg350-36ed0b1d3c662743f638fc7c9275f6952542c23d.zip |
renamed classes (we have our own namespace now) + fixed segfault in logic
svn-id: r10618
Diffstat (limited to 'queen/cutaway.h')
-rw-r--r-- | queen/cutaway.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/queen/cutaway.h b/queen/cutaway.h index 38473e8589..94e3dd4c5e 100644 --- a/queen/cutaway.h +++ b/queen/cutaway.h @@ -26,18 +26,18 @@ namespace Queen { -class QueenResource; -class QueenLogic; -class QueenGraphics; +class Resource; +class Logic; +class Graphics; -class QueenCutaway { +class Cutaway { public: //! Public interface to run a cutaway from a file static void run( const char *filename, char *nextFilename, - QueenLogic *queenLogic, - QueenResource *queenResource); + Logic *logic, + Resource *resource); private: //! Collection of constants used by QueenCutaway enum { @@ -120,8 +120,8 @@ class QueenCutaway { int16 image; }; - QueenLogic *_queenLogic; - QueenGraphics *_queenGraphics; + Logic *_logic; + Graphics *_graphics; //! Raw .cut file data (without 20 byte header) byte *_fileData; @@ -178,17 +178,17 @@ class QueenCutaway { int16 _songBeforeComic; - QueenCutaway( + Cutaway( const char *filename, - QueenLogic *queenLogic, - QueenResource *queenResource); - ~QueenCutaway(); + Logic *logic, + Resource *resource); + ~Cutaway(); //! Run this cutaway object void run(char *nextFilename); //! Load cutaway data from file - void load(const char *filename, QueenResource *queenResource); + void load(const char *filename, Resource *resource); //! Used by load to read string data void loadStrings(byte *ptr); |