STARTREK: Fix sound, support MT32.

Also jump to the first mission after the intro.

1 files changed, 12 insertions, 3 deletions

diff --git a/engines/startrek/startrek.h b/engines/startrek/startrek.h
index 21981e2382..d5000f79ea 100644
--- a/engines/startrek/startrek.h
+++ b/engines/startrek/startrek.h
@@ -339,11 +339,20 @@ public:
 
 	// Events
 public:
-	void pollSystemEvents(bool queueEvents = true);
+	/**
+	 * Checks for all events, and updates Star Trek's event queue if queueEvents is set.
+	 * This does not account for "tick" events (getNextEvent/popNextEvent handle that).
+	 */
+	void pollEvents(bool queueEvents = true);
+	void waitForNextTick(bool queueEvents = true);
 	void initializeEventsAndMouse();
-	bool getNextEvent(TrekEvent *e);
+	/**
+	 * Returns false if there is no event waiting. If "poll" is true, this always returns
+	 * something (waits until an event occurs if necessary).
+	 */
+	bool getNextEvent(TrekEvent *e, bool poll = true);
 	void removeNextEvent();
-	bool popNextEvent(TrekEvent *e);
+	bool popNextEvent(TrekEvent *e, bool poll = true);
 	void addEventToQueue(const TrekEvent &e);
 	void clearEventBuffer();
 	void updateEvents();