thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MYST3: Spotitem fixes for the menus

Browse source
This commit is contained in:
Bastien Bouclet 2012-01-06 13:38:22 +01:00
parent e92f0cdd00
commit ece5133fdf
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/myst3/directorysubentry.h
View file

@ -54,6 +54,7 @@ class DirectorySubEntry {
kCursor = 7, kCursor = 7,
kMovie = 8, kMovie = 8,
kStillMovie = 10, kStillMovie = 10,
kMenuSpotItem = 69,
kMenuFrame = 70, kMenuFrame = 70,
kImagerMovie = 72 kImagerMovie = 72
}; };

21
engines/myst3/node.cpp
View file

@ -143,6 +143,9 @@ void Node::loadSpotItem(uint16 id, uint16 condition, bool fade) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
const DirectorySubEntry *jpegDesc = _vm->getFileDescription(id, i + 1, DirectorySubEntry::kSpotItem); const DirectorySubEntry *jpegDesc = _vm->getFileDescription(id, i + 1, DirectorySubEntry::kSpotItem);
if (!jpegDesc)
jpegDesc = _vm->getFileDescription(id, i + 1, DirectorySubEntry::kMenuSpotItem);
if (!jpegDesc) continue; if (!jpegDesc) continue;
SpotItemFace *spotItemFace = new SpotItemFace( SpotItemFace *spotItemFace = new SpotItemFace(
@ -166,8 +169,14 @@ void Node::loadSpotItem(uint16 id, uint16 condition, bool fade) {
} }
void Node::update() { void Node::update() {
// First undraw ...
for (uint i = 0; i < _spotItems.size(); i++) { for (uint i = 0; i < _spotItems.size(); i++) {
_spotItems[i]->update(); _spotItems[i]->updateUndraw();
}
// ... then redraw
for (uint i = 0; i < _spotItems.size(); i++) {
_spotItems[i]->updateDraw();
} }
} }
@ -181,22 +190,24 @@ SpotItem::~SpotItem() {
} }
} }
void SpotItem::update() { void SpotItem::updateUndraw() {
// First undraw ...
for (uint i = 0; i < _faces.size(); i++) { for (uint i = 0; i < _faces.size(); i++) {
if (!_vm->_vars->evaluate(_condition) && _faces[i]->isDrawn()) { if (!_vm->_vars->evaluate(_condition) && _faces[i]->isDrawn()) {
_faces[i]->undraw(); _faces[i]->undraw();
} }
} }
}
// ... then redraw void SpotItem::updateDraw() {
for (uint i = 0; i < _faces.size(); i++) { for (uint i = 0; i < _faces.size(); i++) {
if (_enableFade) {
uint16 newFadeValue = _vm->_vars->get(_fadeVar); uint16 newFadeValue = _vm->_vars->get(_fadeVar);
if (_enableFade && _faces[i]->getFadeValue() != newFadeValue) { if (_faces[i]->getFadeValue() != newFadeValue) {
_faces[i]->setFadeValue(newFadeValue); _faces[i]->setFadeValue(newFadeValue);
_faces[i]->setDrawn(false); _faces[i]->setDrawn(false);
} }
}
if (_vm->_vars->evaluate(_condition) && !_faces[i]->isDrawn()) { if (_vm->_vars->evaluate(_condition) && !_faces[i]->isDrawn()) {
if (_enableFade) if (_enableFade)

3
engines/myst3/node.h
View file

@ -90,7 +90,8 @@ class SpotItem {
void setFadeVar(uint16 var) { _fadeVar = var; } void setFadeVar(uint16 var) { _fadeVar = var; }
void addFace(SpotItemFace *face) { _faces.push_back(face); } void addFace(SpotItemFace *face) { _faces.push_back(face); }
void update(); void updateUndraw();
void updateDraw();
private: private:
Myst3Engine *_vm; Myst3Engine *_vm;