aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorLars Persson2007-03-12 19:53:36 +0000
committerLars Persson2007-03-12 19:53:36 +0000
commit4c82e3ac239d946db9eac80a2736f88094062d35 (patch)
treeba0d9b174784e5a656fab720838339ec6f0b0fb9 /engines/scumm
parent5771a9c730a9a75f4fe2660a3dbfb79ff3d8ed31 (diff)
downloadscummvm-rg350-4c82e3ac239d946db9eac80a2736f88094062d35.tar.gz
scummvm-rg350-4c82e3ac239d946db9eac80a2736f88094062d35.tar.bz2
scummvm-rg350-4c82e3ac239d946db9eac80a2736f88094062d35.zip
Special filehandling for Symbian OS not needed in smushplayer anymore.
svn-id: r26106
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/smush/smush_player.cpp18
-rw-r--r--engines/scumm/smush/smush_player.h3
2 files changed, 0 insertions, 21 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index de6083a3a4..79930160a9 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -215,13 +215,6 @@ void SmushPlayer::timerCallback() {
_inTimer = true;
_inTimerCount++;
#endif
-#ifdef __SYMBIAN32__
- if (_closeOnTextTick) {
- delete _base;
- _base = NULL;
- _closeOnTextTick = false;
- }
-#endif
}
SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) {
@@ -263,9 +256,6 @@ SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) {
_inTimerCount = 0;
_inTimerCountRedraw = ConfMan.getInt("Smush_force_redraw");
#endif
-#ifdef __SYMBIAN32__
- _closeOnTextTick = false;
-#endif
}
SmushPlayer::~SmushPlayer() {
@@ -300,14 +290,6 @@ void SmushPlayer::init(int32 speed) {
}
void SmushPlayer::release() {
-#ifdef __SYMBIAN32__
- _closeOnTextTick = true;
- // Wait for _closeOnTextTick to be set to false to indicate file closure
- while (_closeOnTextTick) {
- User::After(15624);
- }
-#endif
-
_vm->_smushVideoShouldFinish = true;
for (int i = 0; i < 5; i++) {
diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h
index 6b09729318..f4b1b5881e 100644
--- a/engines/scumm/smush/smush_player.h
+++ b/engines/scumm/smush/smush_player.h
@@ -86,9 +86,6 @@ private:
int16 _inTimerCount;
int16 _inTimerCountRedraw;
#endif
-#ifdef __SYMBIAN32__
- bool _closeOnTextTick;
-#endif
public:
SmushPlayer(ScummEngine_v7 *scumm);