[Scummvm-cvs-logs] scummvm master -> 9bd16b80c943eb115a1bb6e6c4a6e78d2e2bfeee
somaen
einarjohan at somadalen.com
Sun Dec 9 16:46:11 CET 2012
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9bd16b80c9 WINTERMUTE: Remove code moved in previous commit.
Commit: 9bd16b80c943eb115a1bb6e6c4a6e78d2e2bfeee
https://github.com/scummvm/scummvm/commit/9bd16b80c943eb115a1bb6e6c4a6e78d2e2bfeee
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2012-12-09T07:45:20-08:00
Commit Message:
WINTERMUTE: Remove code moved in previous commit.
Changed paths:
engines/wintermute/base/base_game.cpp
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index e5e3472..056bc96 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -40,7 +40,6 @@
#include "engines/wintermute/base/base_keyboard_state.h"
#include "engines/wintermute/base/base_parser.h"
#include "engines/wintermute/base/base_quick_msg.h"
-#include "engines/wintermute/base/sound/base_sound.h"
#include "engines/wintermute/base/sound/base_sound_manager.h"
#include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/base/base_sub_frame.h"
@@ -1089,25 +1088,6 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
}
//////////////////////////////////////////////////////////////////////////
- // GetSoundLength
- //////////////////////////////////////////////////////////////////////////
- else if (strcmp(name, "GetSoundLength") == 0) {
- stack->correctParams(1);
-
- int length = 0;
- const char *filename = stack->pop()->getString();
-
- BaseSound *sound = new BaseSound(_gameRef);
- if (sound && DID_SUCCEED(sound->setSound(filename, Audio::Mixer::kMusicSoundType, true))) {
- length = sound->getLength();
- delete sound;
- sound = NULL;
- }
- stack->pushInt(length);
- return STATUS_OK;
- }
-
- //////////////////////////////////////////////////////////////////////////
// SetMousePos
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "SetMousePos") == 0) {
More information about the Scummvm-git-logs
mailing list