libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 04:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GRIM: Initialize Chore::_fade in Chore constructor, instead in Chore::fade().

Browse Source
This commit is contained in:
Giulio Camuffo 2011-05-28 14:38:07 +02:00
parent 5d6f3ad2c0
commit a19449d097
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/grim/costume.cpp
View File

@ -1215,7 +1215,7 @@ void Costume::Component::removeChild(Component *child) {
// Should initialize the status variables so the chore can't play unexpectedly
Costume::Chore::Chore() : _hasPlayed(false), _playing(false), _looping(false), _currTime(-1),
_tracks(NULL), _fadeMode(None) {
_tracks(NULL), _fadeMode(None), _fade(1.f) {
}
Costume::Chore::~Chore() {
@ -1364,7 +1364,6 @@ void Costume::Chore::update() {
}
void Costume::Chore::fade(Costume::Chore::FadeMode mode, int msecs) {
_fade = 1.0f;
if (mode == FadeIn) {
if (!_playing || _fadeMode == None) {
_currTime = -1;