libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Another try to get rid of the hidden overloaded functions

Browse Source
This commit is contained in:
Strangerke 2014-03-09 21:34:32 +01:00
parent 857a017e8c
commit 118e7395c3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/voyeur/animation.cpp
View File

@ -50,10 +50,10 @@ RL2Decoder::~RL2Decoder() {
bool RL2Decoder::loadVideo(int videoId) {
Common::String filename = Common::String::format("%s.rl2",
::Voyeur::SZ_FILENAMES[videoId * 2]);
return loadFile(filename, false);
return loadRL2File(filename, false);
}
bool RL2Decoder::loadFile(const Common::String &file, bool palFlag) {
bool RL2Decoder::loadRL2File(const Common::String &file, bool palFlag) {
bool result = VideoDecoder::loadFile(file);
_paletteStart = palFlag ? 0 : 128;
return result;
@ -115,7 +115,7 @@ void RL2Decoder::copyDirtyRectsToBuffer(uint8 *dst, uint pitch) {
void RL2Decoder::readNextPacket() {
int frameNumber = getCurFrame();
RL2AudioTrack *audioTrack = getAudioTrack();
RL2AudioTrack *audioTrack = RL2Decoder::getAudioTrack();
// Handle queueing sound data
if (_soundFrameNumber == -1)

2
engines/voyeur/animation.h
View File

@ -174,7 +174,7 @@ public:
virtual void close();
bool loadStream(Common::SeekableReadStream *stream);
virtual bool loadFile(const Common::String &file, bool palFlag);
bool loadRL2File(const Common::String &file, bool palFlag);
bool loadVideo(int videoId);
int getPaletteCount() const { return _header._colorCount; }

4
engines/voyeur/voyeur.cpp
View File

@ -457,7 +457,7 @@ void VoyeurEngine::doOpening() {
flipPageAndWait();
RL2Decoder decoder;
decoder.loadFile("a2300100.rl2", false);
decoder.loadRL2File("a2300100.rl2", false);
decoder.start();
while (!shouldQuit() && !decoder.endOfVideo() && !_eventsManager->_mouseClicked) {
@ -511,7 +511,7 @@ void VoyeurEngine::doOpening() {
void VoyeurEngine::playRL2Video(const Common::String &filename) {
RL2Decoder decoder;
decoder.loadFile(filename, false);
decoder.loadRL2File(filename, false);
decoder.start();
while (!shouldQuit() && !decoder.endOfVideo() && !_eventsManager->_mouseClicked) {

6
engines/voyeur/voyeur_game.cpp
View File

@ -237,7 +237,7 @@ void VoyeurEngine::doTailTitle() {
if (_bVoy->getBoltGroup(0x600)) {
RL2Decoder decoder;
decoder.loadFile("a1100200.rl2", false);
decoder.loadRL2File("a1100200.rl2", false);
decoder.start();
decoder.play(this);
@ -742,7 +742,7 @@ void VoyeurEngine::doGossip() {
// Load the gossip animation
RL2Decoder decoder;
decoder.loadFile("a2050100.rl2", false);
decoder.loadRL2File("a2050100.rl2", false);
decoder.start();
// Get the resource data for the first gossip video
@ -768,7 +768,7 @@ void VoyeurEngine::doGossip() {
// Play interview video
RL2Decoder decoder2;
decoder2.loadFile("a2110100.rl2", true);
decoder2.loadRL2File("a2110100.rl2", true);
decoder2.start();
_eventsManager->getMouseInfo();