aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/startrek.h
diff options
context:
space:
mode:
authorMatthew Stewart2018-02-24 13:59:08 -0500
committerEugene Sandulenko2018-08-09 08:37:30 +0200
commit2dd96e044f46aed90ed1b6dbc682bc01f43e438c (patch)
treeb0baea094d31ed729989c316750834f6a75c355e /engines/startrek/startrek.h
parent8cd5441959108b890d1433e70376c6cc1dd3bdb5 (diff)
downloadscummvm-rg350-2dd96e044f46aed90ed1b6dbc682bc01f43e438c.tar.gz
scummvm-rg350-2dd96e044f46aed90ed1b6dbc682bc01f43e438c.tar.bz2
scummvm-rg350-2dd96e044f46aed90ed1b6dbc682bc01f43e438c.zip
STARTREK: Begin implementation of showText.
Also started using SharedPtrs.
Diffstat (limited to 'engines/startrek/startrek.h')
-rwxr-xr-xengines/startrek/startrek.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/engines/startrek/startrek.h b/engines/startrek/startrek.h
index 22dec315b5..9bf1065655 100755
--- a/engines/startrek/startrek.h
+++ b/engines/startrek/startrek.h
@@ -26,18 +26,23 @@
#ifndef STARTREK_H
#define STARTREK_H
-#include "common/scummsys.h"
-#include "common/util.h"
-#include "common/system.h"
+#include "common/ptr.h"
#include "common/rect.h"
+#include "common/scummsys.h"
#include "common/str.h"
#include "common/stream.h"
+#include "common/system.h"
+#include "common/util.h"
#include "engines/engine.h"
+#include "startrek/filestream.h"
#include "startrek/graphics.h"
#include "startrek/sound.h"
+
+using Common::SharedPtr;
+
namespace Common {
class MacResManager;
}
@@ -65,6 +70,9 @@ public:
StarTrekEngine(OSystem *syst, const StarTrekGameDescription *gamedesc);
virtual ~StarTrekEngine();
+ // Running the game
+ void pollEvents();
+
// Detection related functions
const StarTrekGameDescription *_gameDescription;
uint32 getFeatures() const;
@@ -74,7 +82,7 @@ public:
Common::Language getLanguage();
// Resource related functions
- Common::SeekableReadStreamEndian *openFile(Common::String filename, int fileIndex=0);
+ SharedPtr<FileStream> openFile(Common::String filename, int fileIndex=0);
// Movie related functions
void playMovie(Common::String filename);
@@ -84,8 +92,6 @@ private:
Graphics *_gfx;
Sound *_sound;
Common::MacResManager *_macResFork;
-
- byte getStartingIndex(Common::String filename);
};
} // End of namespace StarTrek