libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-20 19:21:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HYPNO: removed unused currentFrame field and some extra spaces

Browse Source
This commit is contained in:
neuromancer 2022-02-27 13:30:53 +01:00
parent a52afca14a
commit 6a9f6fe3d5
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/hypno/arcade.cpp
View File

@ -384,7 +384,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
} else {
s.video = new MVideo(it->animation, it->position, true, false, false);
playVideo(*s.video);
s.video->currentFrame = s.video->decoder->decodeNextFrame(); // Skip the first frame
s.video->decoder->decodeNextFrame(); // Make sure the palette is loaded
if (s.attackFrames.size() == 0) {
uint32 lastFrame = s.bodyFrames.back().lastFrame();
s.attackFrames.push_back(lastFrame - 3);

1
engines/hypno/grammar.h
View File

@ -51,7 +51,6 @@ public:
bool transparent;
bool loop;
HypnoSmackerDecoder *decoder;
const Graphics::Surface *currentFrame;
};
typedef Common::Array<MVideo> Videos;

3
engines/hypno/hypno.cpp
View File

@ -430,7 +430,6 @@ void HypnoEngine::updateScreen(MVideo &video) {
const Graphics::Surface *frame = video.decoder->decodeNextFrame();
bool dirtyPalette = video.decoder->hasDirtyPalette();
video.currentFrame = frame;
if (frame->h == 0 || frame->w == 0 || video.decoder->getPalette() == nullptr)
return;
@ -522,7 +521,7 @@ void HypnoEngine::playSound(const Common::String &filename, uint32 loops, uint32
if (file->open(name)) {
stream = new Audio::LoopingAudioStream(Audio::makeRawStream(file, sampleRate, Audio::FLAG_UNSIGNED, DisposeAfterUse::YES), loops);
_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle, stream, -1, Audio::Mixer::kMaxChannelVolume);
} else
} else
debugC(1, kHypnoDebugMedia, "%s not found!", name.c_str());
}
}

4
engines/hypno/scene.cpp
View File

@ -412,8 +412,8 @@ void HypnoEngine::runScene(Scene *scene) {
if (it->decoder) {
if (it->decoder->endOfVideo()) {
if (it->scaled ||
( it->currentFrame->w == _screenW
&& it->currentFrame->h == _screenH
( it->decoder->getWidth() == _screenW
&& it->decoder->getHeight() == _screenH
&& it->decoder->getCurFrame() > 0)) {
runMenu(stack.back());
drawScreen();

1
engines/hypno/video.cpp
View File

@ -26,7 +26,6 @@ namespace Hypno {
MVideo::MVideo(Common::String path_, Common::Point position_, bool transparent_, bool scaled_, bool loop_) {
decoder = nullptr;
currentFrame = nullptr;
path = path_;
position = position_;
scaled = scaled_;