diff options
| author | Paul Gilbert | 2016-08-14 08:55:37 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-14 08:55:37 -0400 |
| commit | 6c3fdca97beec1bf6a2e6a755d754ba8e0796995 (patch) | |
| tree | 468636b3f6bb6f6ed7f78747a32df6352f10496a /engines/titanic/core | |
| parent | 3e06aad21987481170d95d5fa83a0b2692787533 (diff) | |
| download | scummvm-rg350-6c3fdca97beec1bf6a2e6a755d754ba8e0796995.tar.gz scummvm-rg350-6c3fdca97beec1bf6a2e6a755d754ba8e0796995.tar.bz2 scummvm-rg350-6c3fdca97beec1bf6a2e6a755d754ba8e0796995.zip | |
TITANIC: Finished CParrot class
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index b9d819fc25..849682c1a3 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -61,16 +61,6 @@ private: void loadResource(const CString &name); /** - * Loads a movie - */ - void loadMovie(const CString &name, bool pendingFlag = true); - - /** - * Loads an image - */ - void loadImage(const CString &name, bool pendingFlag = true); - - /** * Process and remove any registered movie range info */ void processMoveRangeInfo(); @@ -128,6 +118,16 @@ protected: */ CViewItem * parseView(const CString &viewString); + /** + * Loads a movie + */ + void loadMovie(const CString &name, bool pendingFlag = true); + + /** + * Loads an image + */ + void loadImage(const CString &name, bool pendingFlag = true); + void inc54(); void dec54(); |