From f5d2695800473fa44500dc3fdaa92f9fcff844b9 Mon Sep 17 00:00:00 2001 From: Arnaud Boutonné Date: Sat, 6 Nov 2010 13:21:18 +0000 Subject: HUGO: Move _palette to display.cpp svn-id: r54102 --- engines/hugo/hugo.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'engines/hugo/hugo.h') diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index 815ef2b75e..19f86ac061 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -123,7 +123,6 @@ public: byte *_screen_p; byte _heroImage; - byte *_palette; byte *_introX; byte *_introY; byte *_screenStates; @@ -262,7 +261,6 @@ protected: private: int _mouseX; int _mouseY; - byte _paletteSize; byte _introXSize; status_t _status; // Game status structure @@ -275,17 +273,17 @@ private: // Vinterstum: These shouldn't be static, but we get weird pathfinding issues (and Valgrind warnings) without. // Needs more investigation. Alignment issues? - static overlay_t _boundary; // Boundary overlay file - static overlay_t _overlay; // First overlay file - static overlay_t _ovlBase; // First overlay base file - static overlay_t _objBound; // Boundary file marks object baselines + static overlay_t _boundary; // Boundary overlay file + static overlay_t _overlay; // First overlay file + static overlay_t _ovlBase; // First overlay base file + static overlay_t _objBound; // Boundary file marks object baselines GameType _gameType; Common::Platform _platform; bool _packedFl; - int _score; // Holds current score - int _maxscore; // Holds maximum score + int _score; // Holds current score + int _maxscore; // Holds maximum score char **loadTextsVariante(Common::File &in, uint16 *arraySize); char ***loadTextsArray(Common::File &in); -- cgit v1.2.3